diff options
author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2015-11-22 15:31:52 +0000 |
---|---|---|
committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2015-11-22 18:00:12 +0000 |
commit | a5d32e13b1c69d46528627228fb1e3071ddd8b38 (patch) | |
tree | 6c1e340d1a50655b3f0eb3d21e87fefbf388fef6 | |
parent | profiles/common: Drop more files (diff) | |
download | portage-a5d32e13b1c69d46528627228fb1e3071ddd8b38.tar.xz |
eclass/linux-build: Restore previous config if possible
9 files changed, 42 insertions, 9 deletions
diff --git a/eclass/linux-build.eclass b/eclass/linux-build.eclass index 755ea36e..396ecc11 100644 --- a/eclass/linux-build.eclass +++ b/eclass/linux-build.eclass @@ -67,7 +67,35 @@ _linux-build_configval() { esac } -_linux-build_pkg_setup-build() { +_linux-build_pkg_setup-build-config() { + local _v + + if ! use savedconfig ; then + return 0 + fi + + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + return 0 + fi + + for _v in "${PF}" "${P}" "${PN}" ; do + if [[ -e "${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${_v}" ]] ; then + return 0 + fi + done + + for _v in ${REPLACING_VERSIONS} ; do + einfo "Restoring previous install configuration" + if [[ -e "${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${PN}-${_v}" ]] ; then + einfo "From ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${PN}-${_v}" + cp "${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${PN}-${_v}" \ + "${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${PF}" + eend 0 + fi + done +} + +_linux-build_pkg_setup-build-x509() { local _v for _v in "${PF}" "${P}" "${PN}" ; do @@ -94,6 +122,11 @@ _linux-build_pkg_setup-build() { done } +_linux-build_pkg_setup-build() { + _linux-build_pkg_setup-build-config + _linux-build_pkg_setup-build-x509 +} + linux-build_pkg_setup() { kernel-2_pkg_setup diff --git a/metadata/md5-cache/sys-kernel/longterm-sources-3.10.92 b/metadata/md5-cache/sys-kernel/longterm-sources-3.10.92 index 920895c8..d3406ac2 100644 --- a/metadata/md5-cache/sys-kernel/longterm-sources-3.10.92 +++ b/metadata/md5-cache/sys-kernel/longterm-sources-3.10.92 @@ -11,5 +11,5 @@ REQUIRED_USE=symlink? ( source ) RESTRICT=binchecks strip SLOT=3.10 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.92.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz -_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build 9ccd0454e8d16a4b1e659133884b863a multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build af4868c522fb5ff3fe10f4aee1cb9c2e multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=82203adbe785138993cc491aae7a7131 diff --git a/metadata/md5-cache/sys-kernel/longterm-sources-3.12.49 b/metadata/md5-cache/sys-kernel/longterm-sources-3.12.49 index ff908be9..1a2495ea 100644 --- a/metadata/md5-cache/sys-kernel/longterm-sources-3.12.49 +++ b/metadata/md5-cache/sys-kernel/longterm-sources-3.12.49 @@ -11,5 +11,5 @@ REQUIRED_USE=symlink? ( source ) RESTRICT=binchecks strip SLOT=3.12 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.12.49.xz mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz -_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build 9ccd0454e8d16a4b1e659133884b863a multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build af4868c522fb5ff3fe10f4aee1cb9c2e multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=82203adbe785138993cc491aae7a7131 diff --git a/metadata/md5-cache/sys-kernel/longterm-sources-3.14.56 b/metadata/md5-cache/sys-kernel/longterm-sources-3.14.56 index 4016cb56..e86f3298 100644 --- a/metadata/md5-cache/sys-kernel/longterm-sources-3.14.56 +++ b/metadata/md5-cache/sys-kernel/longterm-sources-3.14.56 @@ -11,5 +11,5 @@ REQUIRED_USE=symlink? ( source ) RESTRICT=binchecks strip SLOT=3.14 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.56.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz -_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build 9ccd0454e8d16a4b1e659133884b863a multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build af4868c522fb5ff3fe10f4aee1cb9c2e multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=82203adbe785138993cc491aae7a7131 diff --git a/metadata/md5-cache/sys-kernel/longterm-sources-3.18.23 b/metadata/md5-cache/sys-kernel/longterm-sources-3.18.23 index ae146a03..f726cde7 100644 --- a/metadata/md5-cache/sys-kernel/longterm-sources-3.18.23 +++ b/metadata/md5-cache/sys-kernel/longterm-sources-3.18.23 @@ -11,5 +11,5 @@ REQUIRED_USE=symlink? ( source ) RESTRICT=binchecks strip SLOT=3.18 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.23.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz -_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build 9ccd0454e8d16a4b1e659133884b863a multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build af4868c522fb5ff3fe10f4aee1cb9c2e multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=82203adbe785138993cc491aae7a7131 diff --git a/metadata/md5-cache/sys-kernel/longterm-sources-3.2.72 b/metadata/md5-cache/sys-kernel/longterm-sources-3.2.72 index 10c9e69e..c2703c25 100644 --- a/metadata/md5-cache/sys-kernel/longterm-sources-3.2.72 +++ b/metadata/md5-cache/sys-kernel/longterm-sources-3.2.72 @@ -11,5 +11,5 @@ REQUIRED_USE=symlink? ( source ) RESTRICT=binchecks strip SLOT=3.2 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.72.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz -_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build 9ccd0454e8d16a4b1e659133884b863a multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build af4868c522fb5ff3fe10f4aee1cb9c2e multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=82203adbe785138993cc491aae7a7131 diff --git a/metadata/md5-cache/sys-kernel/longterm-sources-3.4.110 b/metadata/md5-cache/sys-kernel/longterm-sources-3.4.110 index a3074e70..baf54480 100644 --- a/metadata/md5-cache/sys-kernel/longterm-sources-3.4.110 +++ b/metadata/md5-cache/sys-kernel/longterm-sources-3.4.110 @@ -11,5 +11,5 @@ REQUIRED_USE=symlink? ( source ) RESTRICT=binchecks strip SLOT=3.4 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.110.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz -_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build 9ccd0454e8d16a4b1e659133884b863a multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build af4868c522fb5ff3fe10f4aee1cb9c2e multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=82203adbe785138993cc491aae7a7131 diff --git a/metadata/md5-cache/sys-kernel/longterm-sources-4.1.12 b/metadata/md5-cache/sys-kernel/longterm-sources-4.1.12 index 280879fb..9f82f109 100644 --- a/metadata/md5-cache/sys-kernel/longterm-sources-4.1.12 +++ b/metadata/md5-cache/sys-kernel/longterm-sources-4.1.12 @@ -11,5 +11,5 @@ REQUIRED_USE=symlink? ( source ) RESTRICT=binchecks strip SLOT=4.1 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz -_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build 9ccd0454e8d16a4b1e659133884b863a multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build af4868c522fb5ff3fe10f4aee1cb9c2e multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=82203adbe785138993cc491aae7a7131 diff --git a/metadata/md5-cache/sys-kernel/stable-sources-4.2.5 b/metadata/md5-cache/sys-kernel/stable-sources-4.2.5 index 11e6940a..0741d977 100644 --- a/metadata/md5-cache/sys-kernel/stable-sources-4.2.5 +++ b/metadata/md5-cache/sys-kernel/stable-sources-4.2.5 @@ -11,5 +11,5 @@ REQUIRED_USE=symlink? ( source ) RESTRICT=binchecks strip SLOT=4.2 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.2.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.2.tar.xz -_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build 9ccd0454e8d16a4b1e659133884b863a multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_eclasses_=eutils f813d23e417656bf3917483643165d5a kernel-2 a4c66611301c7fdf1c78202ab683fb1b linux-build af4868c522fb5ff3fe10f4aee1cb9c2e multilib 3972ca401cf7dbb430df9995f5d8d580 portability 3a50b3ec310b86914f98babecc8f89c6 python-any-r1 60a62ae0ee8cd93b4ba99a4c1371eb8b python-utils-r1 7d52f592fc09a002ea150d69507b5bad savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=4279250af705984d7e8a74d093ded410 |