From 535fef89dce65f2d1476590e7e2ddacdcde53610 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 23 Sep 2010 10:08:38 +0200 Subject: [PATCH] [eclass] sabayon-kernel: assimilate Makefile collision workaround in pkg_preinst --- eclass/sabayon-kernel.eclass | 13 +++++++++++++ sys-kernel/linux-openvz/Manifest | 4 ++-- .../linux-openvz/linux-openvz-2.6.27.6.1-r1.ebuild | 9 +-------- .../linux-openvz/linux-openvz-2.6.32.8.1.ebuild | 9 +-------- sys-kernel/linux-vserver/Manifest | 2 +- .../linux-vserver/linux-vserver-2.3.0.36.31.ebuild | 1 + 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eclass/sabayon-kernel.eclass b/eclass/sabayon-kernel.eclass index c1eecb234..0d9588a7a 100644 --- a/eclass/sabayon-kernel.eclass +++ b/eclass/sabayon-kernel.eclass @@ -64,6 +64,13 @@ K_FIRMWARE_PACKAGE="${K_FIRMWARE_PACKAGE:-}" # if your ebuild is one of them, set this to "1" K_ONLY_SOURCES="${K_ONLY_SOURCES:-}" +# @ECLASS-VARIABLE: K_WORKAROUND_SOURCES_COLLISION +# @DESCRIPTION: +# For kernel binary packages, Workaround file collisions with kernel +# sources already providing certain files (like Makefile). Used +# by linux-openvz and linux-vserver +K_WORKAROUND_SOURCES_COLLISION="${K_WORKAROUND_SOURCES_COLLISION:-}" + KERN_INITRAMFS_SEARCH_NAME="${KERN_INITRAMFS_SEARCH_NAME:-initramfs-genkernel*${K_SABKERNEL_NAME}}" # Disable deblobbing feature @@ -340,6 +347,12 @@ sabayon-kernel_pkg_preinst() { linux-mod_pkg_preinst UPDATE_MODULEDB=false fi + if [ -n "${K_WORKAROUND_SOURCES_COLLISION}" ]; then + # Fixing up Makefile collision if already installed by + # openvz-sources + make_file="${ROOT}/usr/src/linux-${KV_FULL}/Makefile" + [[ -f "${make_file}" ]] && rm "${make_file}" + fi } sabayon-kernel_grub2_mkconfig() { diff --git a/sys-kernel/linux-openvz/Manifest b/sys-kernel/linux-openvz/Manifest index 97741dd28..512b83905 100644 --- a/sys-kernel/linux-openvz/Manifest +++ b/sys-kernel/linux-openvz/Manifest @@ -16,5 +16,5 @@ DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c61803 DIST openvz-2.6.27-2.6.27.53.patch.bz2 34532 RMD160 82cf5116bd2b41f47485d0d9aa5cffd327fb8921 SHA1 f791c5e099d75c263e163c8377c5a40ddf78ec53 SHA256 e540bc3df99454f6cef110e9e6758e6994ed4e94d3b0fca5727ecba5406153f7 DIST patch-dobrovolskiy.1-combined.gz 1216953 RMD160 94eb0e5db61c6c96304da03846ece90777799d13 SHA1 c61743f8f579f064d9bbf484f9b915c155e8f9c9 SHA256 4e78d1325e681acfbe1de6ab213a2cfb61544b1675e90dd53bb338e1a7c044d9 DIST patch-kuindzhi.1-combined.gz 1104589 RMD160 bca276d3ee8ef77a985bdbbeef118e23194512fa SHA1 c64bc9d48c83edcaadb334be13bad6014fdd6e47 SHA256 afd96addcec3b51ce00e6239073c964ba9dffb5d5cb58a41baa14882893a9e83 -EBUILD linux-openvz-2.6.27.6.1-r1.ebuild 3060 RMD160 703b08fa2b9f2ba71d32b6c77f2408fc941e239c SHA1 8098baa55ed6664a6bf245c6b69c28df5957ebc5 SHA256 bcfdbb2dc820ce65833a6d23933b0f9d5a3cce918452a8f8b1de65bd3eaca854 -EBUILD linux-openvz-2.6.32.8.1.ebuild 2800 RMD160 fef888c4f11ae7cec1d2cc71723c65fe54ccabd3 SHA1 64ce4ee7bcd44881b12afa47d91a24150b6129fb SHA256 073ad02f58aa79b55f1fca6b1d6a557ba149981ec505f403dbe6b30ae7aeabb7 +EBUILD linux-openvz-2.6.27.6.1-r1.ebuild 2873 RMD160 a8a1e46e31fe81c4851f6c560af1cf5a40e214e1 SHA1 403b13203f198983accf1df56236e9c631515dd2 SHA256 c2f65a4fc6fa43798a5c031fe487c4f4c67677366c5b1cf1824401b7f9caf459 +EBUILD linux-openvz-2.6.32.8.1.ebuild 2613 RMD160 7bd1b23080133cc5daf2420ca54db7012306bb11 SHA1 c5d80ffb807e7b44c7805eca0bc833f36738d3dc SHA256 27d1e0c449316e786dda1db8eaabdb539eaf5a1342eca9b114d7950d1e471911 diff --git a/sys-kernel/linux-openvz/linux-openvz-2.6.27.6.1-r1.ebuild b/sys-kernel/linux-openvz/linux-openvz-2.6.27.6.1-r1.ebuild index a41799fbf..a7a80279c 100644 --- a/sys-kernel/linux-openvz/linux-openvz-2.6.27.6.1-r1.ebuild +++ b/sys-kernel/linux-openvz/linux-openvz-2.6.27.6.1-r1.ebuild @@ -40,6 +40,7 @@ K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.27/x86-64-compat-test-rax-for- ${FILESDIR}/hotfixes/2.6.27/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch" # match openvz-sources K_KERNEL_DISABLE_PR_EXTRAVERSION="0" +K_WORKAROUND_SOURCES_COLLISION="1" inherit sabayon-kernel SLOT=${CKV}-${OVZ_KV} @@ -71,14 +72,6 @@ ${FILESDIR}/sabayon/4200_fbcondecor-0.9.4.patch ${FILESDIR}/sabayon/4300_squashfs-3.4.patch " -pkg_preinst() { - sabayon-kernel_pkg_preinst - # Fixing up Makefile collision if already installed by - # openvz-sources - make_file="${ROOT}/usr/src/linux-${KV_FULL}/Makefile" - [[ -f "${make_file}" ]] && rm "${make_file}" -} - pkg_postinst() { sabayon-kernel_pkg_postinst diff --git a/sys-kernel/linux-openvz/linux-openvz-2.6.32.8.1.ebuild b/sys-kernel/linux-openvz/linux-openvz-2.6.32.8.1.ebuild index 5f46b3db5..d01673edc 100644 --- a/sys-kernel/linux-openvz/linux-openvz-2.6.32.8.1.ebuild +++ b/sys-kernel/linux-openvz/linux-openvz-2.6.32.8.1.ebuild @@ -37,6 +37,7 @@ K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.32/x86-64-compat-test-rax-for- ${FILESDIR}/hotfixes/2.6.32/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch ${FILESDIR}/hotfixes/2.6.32/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch" K_KERNEL_DISABLE_PR_EXTRAVERSION="0" +K_WORKAROUND_SOURCES_COLLISION="1" inherit sabayon-kernel SLOT=${CKV}-${OVZ_KV} @@ -66,14 +67,6 @@ UNIPATCH_LIST="${UNIPATCH_LIST} ${FILESDIR}/sabayon-2.6.32/4200_fbcondecor-0.9.6.patch " -pkg_preinst() { - sabayon-kernel_pkg_preinst - # Fixing up Makefile collision if already installed by - # openvz-sources - make_file="${ROOT}/usr/src/linux-${KV_FULL}/Makefile" - [[ -f "${make_file}" ]] && rm "${make_file}" -} - pkg_postinst() { sabayon-kernel_pkg_postinst diff --git a/sys-kernel/linux-vserver/Manifest b/sys-kernel/linux-vserver/Manifest index 614b48df0..1c334ed81 100644 --- a/sys-kernel/linux-vserver/Manifest +++ b/sys-kernel/linux-vserver/Manifest @@ -7,4 +7,4 @@ DIST genpatches-2.6.35-4.base.tar.bz2 46490 RMD160 59e43f5fc125252d07af500ecc204 DIST genpatches-2.6.35-4.extras.tar.bz2 15486 RMD160 bb61e34c295a5d562f78fe2ac0bc023c9badec2f SHA1 c832349cde052e368cb5ff8c8df296b7a05bd405 SHA256 9291df1cc0f48dba21fff9d5da59c7403ea29269561fca3c0e58658455f208de DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e6f SHA1 4cb1fbfbeedcd658ca37739679c65dfaa136bf4e SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf DIST vserver-patches-2.6.35_2.3.0.36.31.tar.bz2 148472 RMD160 1b772430ec7d7e34e52b477cf8563287d3b3b7ac SHA1 35cbbb2fe9e3058e2fa7a8bd6ddc2fd028fbadab SHA256 e874173800f3a3923c2770164842e77d6eb5efcdb377278baa2a2f602ddbc2f1 -EBUILD linux-vserver-2.3.0.36.31.ebuild 1834 RMD160 6f60df416a39cee193c3e4e88336663691765850 SHA1 681c5c14b4348cef8aabc483acf0baba6662e0f8 SHA256 06461754ea091435e9555a77838564dbe9934825242daa48baeb50ed57cbea50 +EBUILD linux-vserver-2.3.0.36.31.ebuild 1869 RMD160 81a076fec8df1191d65f4a7036238dc2e1bdb518 SHA1 1315c0ebafc2b164ab942bf9dbc5a96a606ab6fe SHA256 861c662c635b690f509c083040206db62a850d004317e391ebb3419e1c1fff07 diff --git a/sys-kernel/linux-vserver/linux-vserver-2.3.0.36.31.ebuild b/sys-kernel/linux-vserver/linux-vserver-2.3.0.36.31.ebuild index 84a95b22d..560b5930c 100644 --- a/sys-kernel/linux-vserver/linux-vserver-2.3.0.36.31.ebuild +++ b/sys-kernel/linux-vserver/linux-vserver-2.3.0.36.31.ebuild @@ -22,6 +22,7 @@ K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71 # match vserver-sources K_KERNEL_DISABLE_PR_EXTRAVERSION="0" K_KERNEL_SLOT_USEPVR="1" +K_WORKAROUND_SOURCES_COLLISION="1" # PLEASE NOTE: grub-handler is known to not work with kernel binary+initramfs installed # by this package, but grub-0.9x support is going to be dropped and there are no # releases shipped with it as of today.