From 1864c1e4998b1b002ebad4d7b3e6359e5e39190d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Mar 2015 14:41:35 -0700 Subject: [PATCH 1/2] util-linux: prune old versions We are no longer patching util-linux and 2.25.2-r2 is stable upstream. --- .../md5-cache/sys-apps/util-linux-2.23.2-r102 | 13 -- .../md5-cache/sys-apps/util-linux-2.24.2 | 14 -- .../md5-cache/sys-apps/util-linux-2.25.2 | 14 -- .../coreos/base/package.accept_keywords | 3 - .../sys-apps/util-linux/Manifest | 3 - ...reate-parent-directory-for-PATHFILES.patch | 36 ---- .../0001-libblkid-add-PARTTYPE-tag.patch | 30 --- .../files/0002-lsblk-add-PARTTYPE-tag.patch | 79 -------- .../util-linux/files/crypto-loop.confd | 9 - .../util-linux/files/crypto-loop.initd | 70 ------- .../util-linux-2.24-fix-fdisk-on-alpha.patch | 13 -- .../files/util-linux-2.24-last-tests.patch | 86 --------- .../util-linux-2.24-skip-last-tests.patch | 41 ---- ...linux-2.25.2-runuser-bash-completion.patch | 33 ---- .../util-linux/util-linux-2.23.2-r102.ebuild | 128 ------------- .../util-linux/util-linux-2.24.2.ebuild | 176 ------------------ .../util-linux/util-linux-2.25.2.ebuild | 174 ----------------- 17 files changed, 922 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.23.2-r102 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.24.2 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.25.2 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0001-build-sys-create-parent-directory-for-PATHFILES.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0001-libblkid-add-PARTTYPE-tag.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0002-lsblk-add-PARTTYPE-tag.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/crypto-loop.confd delete mode 100755 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/crypto-loop.initd delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-fix-fdisk-on-alpha.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.23.2-r102.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.24.2.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.25.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.23.2-r102 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.23.2-r102 deleted file mode 100644 index 9a5230cf2d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.23.2-r102 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install postinst prepare -DEPEND=!sys-process/schedutils !sys-apps/setarch !=sys-libs/ncurses-5.2-r2 ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang ) udev? ( virtual/udev ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers -DESCRIPTION=Various useful Linux utilities -EAPI=4 -HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/ -IUSE=bash-completion caps +cramfs cytune fdformat ncurses nls old-linux pam selinux slang static-libs +suid test tty-helpers udev unicode -KEYWORDS=amd64 -LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain -RDEPEND=!sys-process/schedutils !sys-apps/setarch !=sys-libs/ncurses-5.2-r2 ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang ) udev? ( virtual/udev ) -SLOT=0 -SRC_URI=mirror://kernel/linux/utils/util-linux/v2.23/util-linux-2.23.2.tar.xz -_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=045d173d7bbf1f079c5d37c31dac640d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.24.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.24.2 deleted file mode 100644 index 5cfdfb3f3c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.24.2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare setup test -DEPEND=!sys-process/schedutils !sys-apps/setarch !=sys-libs/ncurses-5.2-r2 ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:2[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) udev? ( virtual/udev ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers -DESCRIPTION=Various useful Linux utilities -EAPI=4 -HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/ -IUSE=bash-completion caps +cramfs cytune fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode python_targets_python3_3 python_targets_python2_7 python_single_target_python3_3 python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux -LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain -RDEPEND=!sys-process/schedutils !sys-apps/setarch !=sys-libs/ncurses-5.2-r2 ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:2[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) udev? ( virtual/udev ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) -REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) -SLOT=0 -SRC_URI=mirror://kernel/linux/utils/util-linux/v2.24/util-linux-2.24.2.tar.xz -_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild ddc59d206214ef1c240093e1bb2513cf multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 9eb4b5fb858228316d8bb32ada51f6a5 multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 python-single-r1 cc5b6367244dc2070b496eb9a92d5b87 python-utils-r1 d5328656d500f65898a5f51634722f61 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=932839f07cccf5313fea67675c1a40a8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.25.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.25.2 deleted file mode 100644 index 32603794ff..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/util-linux-2.25.2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare setup test -DEPEND=!sys-process/schedutils !sys-apps/setarch !=sys-libs/ncurses-5.2-r2 ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:2[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) udev? ( virtual/udev ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers -DESCRIPTION=Various useful Linux utilities -EAPI=4 -HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/ -IUSE=caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux -LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain -RDEPEND=!sys-process/schedutils !sys-apps/setarch !=sys-libs/ncurses-5.2-r2 ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:2[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) udev? ( virtual/udev ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) -REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) -SLOT=0 -SRC_URI=mirror://kernel/linux/utils/util-linux/v2.25/util-linux-2.25.2.tar.xz -_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild ddc59d206214ef1c240093e1bb2513cf multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 9eb4b5fb858228316d8bb32ada51f6a5 multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 python-single-r1 cc5b6367244dc2070b496eb9a92d5b87 python-utils-r1 d5328656d500f65898a5f51634722f61 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=7f46ed2555977c540e2c038dfee1208d diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 8814d6f761..450a5f17e2 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -25,7 +25,6 @@ =dev-libs/libgpg-error-1.10-r1 ~amd64 =net-misc/dhcp-4.2.2-r1 ~amd64 =app-benchmarks/i7z-0.27-r1 ~amd64 -=sys-apps/util-linux-2.22.2 ~amd64 =dev-libs/opencryptoki-2.4.2 ~amd64 # Replace the function.sh script in baselayout @@ -33,8 +32,6 @@ #=dev-libs/libxml2-2.9.0-r1 ~amd64 -=sys-apps/util-linux-2.25.2 ~amd64 - # CRIU dependencies =dev-libs/protobuf-c-0.15 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/Manifest deleted file mode 100644 index ca4dc421cc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST util-linux-2.23.2.tar.xz 3383052 SHA256 7c4042bd91f621250d7b3b2f34e3b11921a32c7f080c149dcc0c7ce62a8a7cac SHA512 dcccf8e3a3892a2ac98eea0a7e1c24c1b612ef10b466a8b34d8ebe6c2d49778bc9e8bfb1866ce0daa6db387396659120c290c5b36f47864c4d513b5ed15f9618 WHIRLPOOL 525d1043b985fc8238a023caf79c5ebf8f105e9e2c3730b70f19f2e8e0ecbf4984ab6a6a1a6edc2bb41f0b2067e6a788a0c5fb41ad00e84bf0c1bfd5b53cf7f6 -DIST util-linux-2.24.2.tar.xz 3586580 SHA256 1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 SHA512 a0c03876ef19fa09e434e3e5362fb3f3e0a254b3b39a623ac7a9a207d06afce00366792244ed0fac86931f8340c046620660f33c3444a07a12037182fc191240 WHIRLPOOL 4b8185e1832145c050a8aa0761ae017d846ed58cd7e07710e4c32bf92a8f6e530bddb56dab70c8025eddb4cafafed79e658b0aced3a190b61b508078a438a9ed -DIST util-linux-2.25.2.tar.xz 3703644 SHA256 e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512 cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387 WHIRLPOOL dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0001-build-sys-create-parent-directory-for-PATHFILES.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0001-build-sys-create-parent-directory-for-PATHFILES.patch deleted file mode 100644 index b5249aa008..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0001-build-sys-create-parent-directory-for-PATHFILES.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 652e0379c181b3e7a477f9a67e1ada0988421513 Mon Sep 17 00:00:00 2001 -From: Michael Marineau -Date: Tue, 2 Sep 2014 20:25:39 -0700 -Subject: [PATCH] build-sys: create parent directory for $(PATHFILES) - -When building outside the source tree there is nothing to guarantee the -target directory exists before writing to it. Most of the time this just -happens to work because something else creates the directory but not -always. For example: - - $ mkdir build - $ cd build - $ ../configure --disable-dependency-tracking - $ make libuuid/uuid.pc - GEN libuuid/uuid.pc - /bin/sh: line 2: libuuid/uuid.pc.tmp: No such file or directory - make: *** [libuuid/uuid.pc] Error 1 ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index 79b5aea..08269e2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -128,6 +128,7 @@ EXTRA_DIST += $(PATHFILES:=.in) - - $(PATHFILES): Makefile - @ rm -f $@ $@.tmp -+ $(AM_V_at) test -d $(dir $@) || mkdir -p $(dir $@) - $(AM_V_GEN) srcdir=''; \ - test -f ./$@.in || srcdir=$(srcdir)/; \ - $(edit_cmd) $${srcdir}$@.in >$@.tmp --- -1.8.5.5 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0001-libblkid-add-PARTTYPE-tag.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0001-libblkid-add-PARTTYPE-tag.patch deleted file mode 100644 index 427e4a716d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0001-libblkid-add-PARTTYPE-tag.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 55d8ed5295f09c73403dd2c09bc56fad9343af17 Mon Sep 17 00:00:00 2001 -From: Michael Marineau -Date: Tue, 14 Jan 2014 13:06:43 -0800 -Subject: [PATCH 1/2] libblkid: add PARTTYPE tag - -Add PARTTYPE to make searching for devices partition possible without -dropping to the low-level probe API and searching all devices by -PART_ENTRY_TYPE. For example to find any 'EFI System Partition' devices: - -$ blkid -t PARTTYPE=c12a7328-f81f-11d2-ba4b-00a0c93ec93b ---- - libblkid/src/verify.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libblkid/src/verify.c b/libblkid/src/verify.c -index 1c0ca0f..eac613e 100644 ---- a/libblkid/src/verify.c -+++ b/libblkid/src/verify.c -@@ -38,6 +38,8 @@ static void blkid_probe_to_tags(blkid_probe pr, blkid_dev dev) - blkid_set_tag(dev, "PARTUUID", data, len); - else if (strcmp(name, "PART_ENTRY_NAME") == 0) - blkid_set_tag(dev, "PARTLABEL", data, len); -+ else if (strcmp(name, "PART_ENTRY_TYPE") == 0) -+ blkid_set_tag(dev, "PARTTYPE", data, len); - - } else if (!strstr(name, "_ID")) { - /* superblock UUID, LABEL, ... --- -1.8.3.2 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0002-lsblk-add-PARTTYPE-tag.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0002-lsblk-add-PARTTYPE-tag.patch deleted file mode 100644 index 3e325b690d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/0002-lsblk-add-PARTTYPE-tag.patch +++ /dev/null @@ -1,79 +0,0 @@ -From e317d6c10d773519489794752ab0dcad1e65763e Mon Sep 17 00:00:00 2001 -From: Michael Marineau -Date: Tue, 14 Jan 2014 13:07:07 -0800 -Subject: [PATCH 2/2] lsblk: add PARTTYPE tag - -To stay in sync with blkid add PARTTYPE as an available output column. ---- - misc-utils/lsblk.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index 9b53be3..7061531 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -71,6 +71,7 @@ enum { - COL_TARGET, - COL_LABEL, - COL_UUID, -+ COL_PARTTYPE, - COL_PARTLABEL, - COL_PARTUUID, - COL_RA, -@@ -125,6 +126,7 @@ static struct colinfo infos[] = { - [COL_LABEL] = { "LABEL", 0.1, 0, N_("filesystem LABEL") }, - [COL_UUID] = { "UUID", 36, 0, N_("filesystem UUID") }, - -+ [COL_PARTTYPE] = { "PARTTYPE", 36, 0, N_("partition type UUID") }, - [COL_PARTLABEL] = { "PARTLABEL", 0.1, 0, N_("partition LABEL") }, - [COL_PARTUUID] = { "PARTUUID", 36, 0, N_("partition UUID") }, - -@@ -208,6 +210,7 @@ struct blkdev_cxt { - char *fstype; /* detected fs, NULL or "?" if cannot detect */ - char *uuid; /* filesystem UUID (or stack uuid) */ - char *label; /* filesystem label */ -+ char *parttype; /* partiton type UUID */ - char *partuuid; /* partition UUID */ - char *partlabel; /* partiton label */ - char *wwn; /* storage WWN */ -@@ -291,6 +294,7 @@ static void reset_blkdev_cxt(struct blkdev_cxt *cxt) - free(cxt->fstype); - free(cxt->uuid); - free(cxt->label); -+ free(cxt->parttype); - free(cxt->partuuid); - free(cxt->partlabel); - free(cxt->wwn); -@@ -441,6 +445,8 @@ static int get_udev_properties(struct blkdev_cxt *cxt) - } - if ((data = udev_device_get_property_value(dev, "ID_FS_TYPE"))) - cxt->fstype = xstrdup(data); -+ if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE"))) -+ cxt->parttype = xstrdup(data); - if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_UUID"))) - cxt->partuuid = xstrdup(data); - if ((data = udev_device_get_property_value(dev, "ID_WWN"))) -@@ -496,6 +502,8 @@ static void probe_device(struct blkdev_cxt *cxt) - cxt->uuid = xstrdup(data); - if (!blkid_probe_lookup_value(pr, "LABEL", &data, NULL)) - cxt->label = xstrdup(data); -+ if (!blkid_probe_lookup_value(pr, "PART_ENTRY_TYPE", &data, NULL)) -+ cxt->parttype = xstrdup(data); - if (!blkid_probe_lookup_value(pr, "PART_ENTRY_UUID", &data, NULL)) - cxt->partuuid = xstrdup(data); - if (!blkid_probe_lookup_value(pr, "PART_ENTRY_NAME", &data, NULL)) -@@ -752,6 +760,11 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line - if (cxt->uuid) - tt_line_set_data(ln, col, xstrdup(cxt->uuid)); - break; -+ case COL_PARTTYPE: -+ probe_device(cxt); -+ if (cxt->parttype) -+ tt_line_set_data(ln, col, xstrdup(cxt->parttype)); -+ break; - case COL_PARTLABEL: - probe_device(cxt); - if (!cxt->partlabel) --- -1.8.3.2 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/crypto-loop.confd b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/crypto-loop.confd deleted file mode 100644 index 6a88434620..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/crypto-loop.confd +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/conf.d/crypto-loop: Configuration file for /etc/init.d/crypto-loop - -# More info can be found in the init.d script - -# Specify loopback configurations here. The format of this file is -# shown in the following commented-out example. One line per loopback -# configuration. For possible hash values, see `man hashalot`. - -# loop=/dev/loop0 hash='' cipher=serpent keysize=256 device=/dev/system/test other='' diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/crypto-loop.initd b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/crypto-loop.initd deleted file mode 100755 index 853bae2756..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/crypto-loop.initd +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.4 2008/10/26 03:16:48 vapier Exp $ - -depend() { - if [ -x /etc/init.d/root ]; then - need root - else - need checkroot - fi - need modules - before localmount -} - -start() { - local status="0" - - ebegin "Starting crypto loop devices" - - if [ -e /etc/conf.d/crypto-loop ] ; then - egrep "^loop" /etc/conf.d/crypto-loop | \ - while read loopline ; do - eval ${loopline} - - local configured=$(awk -v MOUNT="${device}" \ - '($2 == MOUNT) { print "yes" }' /proc/mounts) - - if [ "${configured}" != "yes" ] ; then - einfo " Loop ${loop} on device ${device} (cipher ${cipher}, key size ${keysize}): " - - if [ -n "${hash}" ] ; then - /usr/sbin/hashalot -n ${keysize} ${hash} /dev/null) ; do - losetup ${loop} > /dev/null 2>&1 - if [ $? -eq 0 ] ; then - ( umount ${loop} || swapoff "${loop}" ) >/dev/null 2>&1 - if ! /sbin/losetup -d ${loop} > /dev/null 2>&1; then - ewarn "Failure deconfiguring ${loop}." - status=1 - fi - fi - done - ewend ${status} -} - - -# vim:ts=4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-fix-fdisk-on-alpha.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-fix-fdisk-on-alpha.patch deleted file mode 100644 index f01a55d6e6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-fix-fdisk-on-alpha.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libfdisk/src/bsd.c.orig 2014-06-11 10:15:47.000000000 +0200 -+++ libfdisk/src/bsd.c 2014-06-11 10:16:18.000000000 +0200 -@@ -787,8 +787,10 @@ - case 0x06: /* DOS 16-bit >=32M */ - case 0xe1: /* DOS access */ - case 0xe3: /* DOS R/O */ -+#if !defined (__alpha__) - case 0xf2: /* DOS secondary */ - return BSD_FS_MSDOS; -+#endif - case 0x07: /* OS/2 HPFS */ - return BSD_FS_HPFS; - default: diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch deleted file mode 100644 index 77cf478e39..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch +++ /dev/null @@ -1,86 +0,0 @@ -https://bugs.gentoo.org/501408 - -From 3c76515abd2e80dc1da03041eb868b8c1e596fb1 Mon Sep 17 00:00:00 2001 -From: Sami Kerola -Date: Sun, 16 Feb 2014 23:54:18 +0000 -Subject: [PATCH] tests: align last.1 with recent phantom detection - -None existing account is not still-logged-in but gone mysteriously, -assuming wtmp logout markup is missing. - -Signed-off-by: Sami Kerola ---- - tests/expected/last/last | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/tests/expected/last/last b/tests/expected/last/last -index 2ff5cc1..dfb140b 100644 ---- a/tests/expected/last/last -+++ b/tests/expected/last/last -@@ -1,6 +1,6 @@ - ~~~ basic output ~~~ - rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57 still logged in -+torvalds linux hobby Mon Aug 26 00:57 gone - no logout - reboot system boot system-name Wed Aug 28 18:00 still running - reboot system boot system-name Wed Aug 28 16:00 - 17:00 (01:00) - IPv4 root dns-server Wed Aug 28 13:00 - 14:00 (01:00) -@@ -17,7 +17,7 @@ accounti foo nine Wed Aug 28 03:00 - 04:00 (01:00) - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ include system ~~~ - rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57 still logged in -+torvalds linux hobby Mon Aug 26 00:57 gone - no logout - reboot system boot system-name Wed Aug 28 18:00 still running - shutdown system down system-name Wed Aug 28 17:00 - 18:00 (01:00) - reboot system boot system-name Wed Aug 28 16:00 - 17:00 (01:00) -@@ -47,16 +47,16 @@ IPv4 root Wed Aug 28 13:00 - 14:00 (01:00) a.root-servers.net - - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ show ip ~~~ --torvalds linux 128.214.205.14 Mon Aug 26 00:57 still logged in -+torvalds linux 128.214.205.14 Mon Aug 26 00:57 gone - no logout - - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ no host ~~~ --torvalds linux Mon Aug 26 00:57 still logged in -+torvalds linux Mon Aug 26 00:57 gone - no logout - - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ full times ~~~ - rick long never-gonna-logo Thu Jan 1 00:00:00 1970 - Tue Jan 19 03:14:07 2038 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57:08 1991 still logged in -+torvalds linux hobby Mon Aug 26 00:57:08 1991 gone - no logout - reboot system boot system-name Wed Aug 28 18:00:00 2013 still running - reboot system boot system-name Wed Aug 28 16:00:00 2013 - Wed Aug 28 17:00:00 2013 (01:00) - IPv4 root dns-server Wed Aug 28 13:00:00 2013 - Wed Aug 28 14:00:00 2013 (01:00) -@@ -73,7 +73,7 @@ accounti foo nine Wed Aug 28 03:00:00 2013 - Wed Aug 28 04: - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ no time ~~~ - rick long never-gonna-logo (24855+03:14) --torvalds linux hobby logged in -+torvalds linux hobby - no logout - reboot system boot system-name running - reboot system boot system-name (01:00) - IPv4 root dns-server (01:00) -@@ -90,7 +90,7 @@ accounti foo nine (01:00) - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ iso-8601 time ~~~ - rick long never-gonna-logout 1970-01-01T00:00:00+0000 - 2038-01-19T03:14:07+0000 (24855+03:14) --torvalds linux hobby 1991-08-26T00:57:08+0000 still logged in -+torvalds linux hobby 1991-08-26T00:57:08+0000 gone - no logout - reboot system boot system-name 2013-08-28T18:00:00+0000 still running - reboot system boot system-name 2013-08-28T16:00:00+0000 - 2013-08-28T17:00:00+0000 (01:00) - IPv4 root dns-server 2013-08-28T13:00:00+0000 - 2013-08-28T14:00:00+0000 (01:00) -@@ -115,7 +115,7 @@ accounti foo nine Wed Aug 28 03:00 - 04:00 (01:00) - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ present ~~~ - rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57 still logged in -+torvalds linux hobby Mon Aug 26 00:57 gone - no logout - runlevel foo one Wed Aug 28 11:00 - 12:00 (01:00) - - wtmp begins Wed Aug 28 03:00:00 2013 --- -1.8.5.5 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch deleted file mode 100644 index 5148053d27..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6b55612b9ad1193a042f3c3a1d9216e63b0d2907 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 22 Dec 2013 18:17:15 -0500 -Subject: [PATCH] tests: last: skip when last is not enabled - -References: https://bugs.gentoo.org/489794 -Signed-off-by: Mike Frysinger ---- - tests/ts/last/ipv6 | 2 ++ - tests/ts/last/last | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/tests/ts/last/ipv6 b/tests/ts/last/ipv6 -index 8e2b01e..60b72bd 100755 ---- a/tests/ts/last/ipv6 -+++ b/tests/ts/last/ipv6 -@@ -18,6 +18,8 @@ TS_DESC="last ipv6" - . $TS_TOPDIR/functions.sh - ts_init "$*" - -+[ -x $TS_CMD_LAST ] || ts_skip "last not enabled" -+ - export LANG=C - export TZ=GMT - -diff --git a/tests/ts/last/last b/tests/ts/last/last -index 4ad38cb..83b7f8d 100755 ---- a/tests/ts/last/last -+++ b/tests/ts/last/last -@@ -18,6 +18,8 @@ TS_DESC="last" - . $TS_TOPDIR/functions.sh - ts_init "$*" - -+[ -x $TS_CMD_LAST ] || ts_skip "last not enabled" -+ - export LANG=C - export TZ=GMT - --- -1.8.4.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch deleted file mode 100644 index 85c48114db..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/522288 - -From a95987423c4d7781a14ffda34f082086cd51f4f7 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 24 Oct 2014 12:08:22 -0400 -Subject: [PATCH] bash-completion: fix runuser install - -The runuser symlink used to depend on su being enabled, but a refactoring -broke that. So if you build with runuser enabled but not su, you end up -with a broken symlink. Rework the logic so it works in both cases. - -Signed-off-by: Mike Frysinger ---- - bash-completion/Makemodule.am | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am -index 271a6db..045c2d5 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -11071,7 +10823,8 @@ - @BUILD_MOUNT_TRUE@@MAKEINSTALL_DO_SETUID_TRUE@ chmod 4755 $(DESTDIR)$(bindir)/umount - - @BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@install-data-hook-bashcomp-runuser:: --@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@ ln -sf su $(DESTDIR)$(bashcompletiondir)/runuser -+@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@@BUILD_SU_TRUE@ ln -sf su $(DESTDIR)$(bashcompletiondir)/runuser -+@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@@BUILD_SU_FALSE@ cp $(top_srcdir)/bash-completion/su $(DESTDIR)$(bashcompletiondir)/runuser - - clean-local-tests: - rm -rf $(top_builddir)/tests/output $(top_builddir)/tests/diff --- -2.1.2 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.23.2-r102.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.23.2-r102.ebuild deleted file mode 100644 index 40b2e6b700..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.23.2-r102.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.23.2-r2.ebuild,v 1.1 2013/09/29 01:41:58 vapier Exp $ - -EAPI="4" -inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -if [[ ${PV} == 9999 ]] ; then - inherit git-2 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - KEYWORDS="amd64" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" - -LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls old-linux pam selinux slang static-libs +suid test tty-helpers udev unicode" - -RDEPEND="!sys-process/schedutils - !sys-apps/setarch - !=sys-libs/ncurses-5.2-r2 ) - pam? ( sys-libs/pam ) - selinux? ( sys-libs/libselinux ) - slang? ( sys-libs/slang ) - udev? ( virtual/udev )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}/0001-libblkid-add-PARTTYPE-tag.patch" - epatch "${FILESDIR}/0002-lsblk-add-PARTTYPE-tag.patch" - - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - fi - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.c - #define _GNU_SOURCE - #include - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.c -} - -src_configure() { - lfs_fallocate_test - export ac_cv_header_security_pam_misc_h=$(usex pam) #485486 - econf \ - --enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \ - $(use_enable nls) \ - --enable-agetty \ - --with-bashcompletiondir="$(get_bashcompdir)" \ - $(use_enable bash-completion) \ - $(use_enable caps setpriv) \ - $(use_enable cramfs) \ - $(use_enable cytune) \ - $(use_enable fdformat) \ - $(use_enable old-linux elvtune) \ - --with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \ - --disable-kill \ - --disable-last \ - --disable-login \ - $(use_enable tty-helpers mesg) \ - --enable-partx \ - --enable-raw \ - --enable-rename \ - --disable-reset \ - --enable-schedutils \ - --disable-su \ - $(use_enable tty-helpers wall) \ - $(use_enable tty-helpers write) \ - $(use_enable suid makeinstall-chown) \ - $(use_enable suid makeinstall-setuid) \ - $(use_with selinux) \ - $(use_with slang) \ - $(use_enable static-libs static) \ - $(use_with udev) \ - $(tc-has-tls || echo --disable-tls) -} - -src_install() { - default - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # need the libs in / - gen_usr_ldscript -a blkid mount uuid - - # e2fsprogs-libs didnt install .la files, and .pc work fine - prune_libtool_files -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.24.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.24.2.ebuild deleted file mode 100644 index c5b6db5706..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.24.2.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.24.2.ebuild,v 1.4 2014/06/18 20:46:09 mgorny Exp $ - -EAPI="4" - -PYTHON_COMPAT=( python2_7 python3_{2,3} ) - -inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - python-single-r1 multilib-minimal - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -if [[ ${PV} == 9999 ]] ; then - inherit git-2 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode" - -RDEPEND="!sys-process/schedutils - !sys-apps/setarch - !=sys-libs/ncurses-5.2-r2 ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - udev? ( virtual/udev ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}/0001-build-sys-create-parent-directory-for-PATHFILES.patch" - epatch "${FILESDIR}/0002-lsblk-add-PARTTYPE-tag.patch" - - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - fi - epatch "${FILESDIR}"/${PN}-2.24-last-tests.patch #501408 - # http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/9237 - epatch "${FILESDIR}"/${PN}-2.24-fix-fdisk-on-alpha.patch - find tests/ -name bigyear -delete #489794 - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -multilib_src_configure() { - lfs_fallocate_test - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - ECONF_SOURCE=${S} \ - econf \ - --docdir="/usr/share/doc/${PF}" \ - --enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \ - $(multilib_native_use_enable nls) \ - --enable-agetty \ - --with-bashcompletiondir="$(get_bashcompdir)" \ - $(multilib_native_use_enable bash-completion) \ - $(multilib_native_use_enable caps setpriv) \ - $(multilib_native_use_enable cramfs) \ - $(multilib_native_use_enable cytune) \ - $(multilib_native_use_enable fdformat) \ - --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ - --disable-kill \ - --disable-login \ - $(multilib_native_use_enable tty-helpers mesg) \ - --disable-nologin \ - --enable-partx \ - $(multilib_native_use_with python) \ - --enable-raw \ - --enable-rename \ - --disable-reset \ - --enable-schedutils \ - --disable-su \ - $(multilib_native_use_enable tty-helpers wall) \ - $(multilib_native_use_enable tty-helpers write) \ - $(multilib_native_use_enable suid makeinstall-chown) \ - $(multilib_native_use_enable suid makeinstall-setuid) \ - $(use_with selinux) \ - $(multilib_native_use_with slang) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with udev) \ - $(tc-has-tls || echo --disable-tls) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - # build libraries only - emake -f Makefile -f - mylibs \ - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ - install-pkgconfigDATA install-uuidincHEADERS \ - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS - fi - - if multilib_is_native_abi; then - # need the libs in / - gen_usr_ldscript -a blkid mount uuid - - use python && python_optimize - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didnt install .la files, and .pc work fine - prune_libtool_files -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.25.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.25.2.ebuild deleted file mode 100644 index c6bb4a4717..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/util-linux/util-linux-2.25.2.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.2.ebuild,v 1.1 2014/10/24 16:27:07 vapier Exp $ - -EAPI="4" - -PYTHON_COMPAT=( python2_7 python3_{2,3,4} ) - -inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - python-single-r1 multilib-minimal - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -if [[ ${PV} == 9999 ]] ; then - inherit git-2 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode" - -RDEPEND="!sys-process/schedutils - !sys-apps/setarch - !=sys-libs/ncurses-5.2-r2 ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - udev? ( virtual/udev ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-runuser-bash-completion.patch #522288 - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - fi - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -multilib_src_configure() { - lfs_fallocate_test - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - # We manually set --libdir to the default since on prefix, econf will set it to - # a value which the configure script does not recognize. This makes it set the - # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25 - ECONF_SOURCE=${S} \ - econf \ - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ - --libdir='${prefix}/'"$(get_libdir)" \ - $(multilib_native_use_enable nls) \ - --enable-agetty \ - --with-bashcompletiondir="$(get_bashcompdir)" \ - --enable-bash-completion \ - $(multilib_native_use_enable caps setpriv) \ - --disable-chfn-chsh \ - $(multilib_native_use_enable cramfs) \ - $(multilib_native_use_enable fdformat) \ - --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ - --disable-kill \ - --disable-login \ - $(multilib_native_use_enable tty-helpers mesg) \ - --disable-nologin \ - --enable-partx \ - $(multilib_native_use_with python) \ - --enable-raw \ - --enable-rename \ - --disable-reset \ - --enable-schedutils \ - --disable-su \ - $(multilib_native_use_enable tty-helpers wall) \ - $(multilib_native_use_enable tty-helpers write) \ - $(multilib_native_use_enable suid makeinstall-chown) \ - $(multilib_native_use_enable suid makeinstall-setuid) \ - $(use_with selinux) \ - $(multilib_native_use_with slang) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with udev) \ - $(tc-has-tls || echo --disable-tls) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - # build libraries only - emake -f Makefile -f - mylibs \ - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ - install-pkgconfigDATA install-uuidincHEADERS \ - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ - install-nodist_smartcolsincHEADERS - fi - - if multilib_is_native_abi; then - # need the libs in / - gen_usr_ldscript -a blkid mount smartcols uuid - - use python && python_optimize - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didnt install .la files, and .pc work fine - prune_libtool_files -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} From 52f98c23cc1d8939df6f9ed65ac22e64e0fe76c4 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Mar 2015 14:45:55 -0700 Subject: [PATCH 2/2] profiles: update to util-linux 2.26.1 Fixes https://github.com/coreos/bugs/issues/301 --- .../profiles/coreos/base/package.accept_keywords | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 450a5f17e2..f3d40f9d59 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -109,3 +109,6 @@ dev-util/checkbashisms # >=3.16 required by docker 1.4 =sys-fs/btrfs-progs-3.17.1 + +# Fixes findmnt with overlay and btrfs filesystems +=sys-apps/util-linux-2.26.1