From b74d1845ca1f60dfa4cc01640b08fc411ad60677 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 28 Feb 2012 11:19:58 -0500 Subject: [PATCH] linux-headers: mark all stable This should let us drop the hardcoded version in the setup_board script and move to normal keyword tracking policy. BUG=None TEST=`./setup_board --board=x86-alex --kernel_version '[stable]'` works Change-Id: I7bb9a44e5cca8fc86d8daef7aa555db9c486a6cf Reviewed-on: https://gerrit.chromium.org/gerrit/16964 Reviewed-by: Mike Frysinger Tested-by: Mike Frysinger Commit-Ready: Mike Frysinger --- .../sys-kernel/linux-headers/Manifest | 4 -- .../linux-headers-2.6.30-r1.ebuild | 50 ------------------- .../linux-headers/linux-headers-2.6.38.ebuild | 49 ------------------ .../linux-headers/linux-headers-3.1.ebuild | 2 +- 4 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.6.30-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest index f9dc310de8..441819216e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest @@ -1,6 +1,2 @@ -DIST gentoo-headers-2.6.30-2.tar.lzma 9119 RMD160 df00b75029cd8b98ae8631b0b42fceda54c5ab4c SHA1 2a33a8714f00087e284a8e0aed9fd33898343694 SHA256 a4b832453e3681f2a44d58b7cb8c56876a34598eaf0a88ebcfba1d3e989a4811 -DIST gentoo-headers-2.6.38-1.tar.xz 3992 RMD160 50921db8cde371d89d3df75f8ffa681570c49a4f SHA1 9c5801dc9634e5693d43357fa1f07c28c26816e8 SHA256 0d38cffc99b9279337ca0f2b789a8db2f73ba856c668998e497aa4d7cc004924 DIST gentoo-headers-3.1-1.tar.xz 16000 RMD160 7ca0e0d245d8051cc8f8b568a00c55b03025f939 SHA1 bc57a527f86ab8fc72783808143065e96552d9f8 SHA256 255fd3e2abafcede9d36ae882d3cd06671b2250820caa987640ddea674500cb9 -DIST gentoo-headers-base-2.6.30.tar.lzma 3861176 RMD160 a43c85ceaadd9b06d8b50962a3e965bd5ce2a226 SHA1 aa1624d161c7c58ebdbde9d2e1a2695f45835c74 SHA256 8201ae0871b561a6c309d2be365204744a0412086c1b1664e748fd1338127f2f -DIST gentoo-headers-base-2.6.38.tar.xz 4614324 RMD160 6368d5782143e30d955366ca0edc8f9fb4934af6 SHA1 72ac6065d9d5fb367858d08760e12da2584a30f6 SHA256 31c9de033a155812302290c3cbfb5d9cf5e8755598f0440ed859a0138740a7bf DIST gentoo-headers-base-3.1.tar.xz 4814816 RMD160 372a0e0fa6dbbc36b91143a1ffc03f843aadff7f SHA1 e0bce0b14ac331f9737c2e4bb61c48fb6ea5f941 SHA256 76bc4baeb1d039a171f6316d3ac6b8f50341937242570988d6705b2d9b02a0c0 diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.6.30-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.6.30-r1.ebuild deleted file mode 100644 index fc35afb914..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.6.30-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.30-r1.ebuild,v 1.11 2010/03/07 22:47:34 maekke Exp $ - -ETYPE="headers" -H_SUPPORTEDARCH="alpha amd64 arm bfin cris hppa m68k mips ia64 ppc ppc64 s390 sh sparc x86" -inherit kernel-2 -detect_version - -PATCH_VER="2" -SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.lzma" -[[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.lzma" - -KEYWORDS="-* alpha amd64 arm hppa ~ia64 ~m68k -mips ppc ppc64 ~s390 -sh ~sparc x86 ~amd64-linux ~x86-linux" - -DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )" -RDEPEND="" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV} - # workaround #244640 - mkdir arch/sparc64 - touch arch/sparc64/Makefile -} - -src_install() { - kernel-2_src_install - cd "${D}" - egrep -r \ - -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ - -e '\<([us](8|16|32|64))\>' \ - . - headers___fix $(find -type f) - - egrep -l -r -e '__[us](8|16|32|64)' "${D}" | xargs grep -L linux/types.h - - # hrm, build system sucks - find "${D}" '(' -name '.install' -o -name '*.cmd' ')' -print0 | xargs -0 rm -f - - # provided by libdrm (for now?) - rm -rf "${D}"/$(kernel_header_destdir)/drm -} - -src_test() { - emake ARCH=$(tc-arch-kernel) headers_check || die -} diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild deleted file mode 100644 index dc69eb46e2..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild,v 1.1 2011/03/18 19:49:01 vapier Exp $ - -EAPI="3" - -ETYPE="headers" -H_SUPPORTEDARCH="alpha amd64 arm bfin cris hppa m68k mips ia64 ppc ppc64 s390 sh sparc x86" -inherit kernel-2 -detect_version - -PATCH_VER="1" -SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz" -[[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV%.1}-${PATCH_VER}.tar.xz" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" - -DEPEND="app-arch/xz-utils" -RDEPEND="" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV%.1} -} - -src_install() { - kernel-2_src_install - cd "${D}" - egrep -r \ - -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ - -e '\<([us](8|16|32|64))\>' \ - . - headers___fix $(find -type f) - - egrep -l -r -e '__[us](8|16|32|64)' "${D}" | xargs grep -L linux/types.h - - # hrm, build system sucks - find "${D}" '(' -name '.install' -o -name '*.cmd' ')' -print0 | xargs -0 rm -f - - # provided by libdrm (for now?) - rm -rf "${D}"/$(kernel_header_destdir)/drm -} - -src_test() { - emake ARCH=$(tc-arch-kernel) headers_check || die -} diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-3.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-3.1.ebuild index 89da35be37..83fb6cee78 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-3.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-3.1.ebuild @@ -13,7 +13,7 @@ PATCH_VER="1" SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz" [[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" DEPEND="app-arch/xz-utils dev-lang/perl"