From b3d2dfd48654503d7860a9ab987a6b0f638d290b Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 15:55:45 +0000 Subject: [PATCH 01/22] profiles: Drop dead arm64 settings Also drop the obsolete GCC lines. --- .../profiles/coreos/arm64/README | 4 -- .../profiles/coreos/arm64/generic/dev/parent | 2 - .../coreos/arm64/generic/make.defaults | 2 - .../coreos/arm64/generic/oem-aci/parent | 2 - .../profiles/coreos/arm64/generic/parent | 2 - .../profiles/coreos/arm64/generic/prod/parent | 2 - .../profiles/coreos/arm64/make.defaults | 0 .../coreos/arm64/package.accept_keywords | 63 ------------------- .../profiles/coreos/arm64/package.provided | 6 -- .../profiles/coreos/arm64/package.use | 8 --- .../profiles/coreos/arm64/package.use.force | 2 - .../profiles/coreos/arm64/package.use.mask | 5 -- .../profiles/coreos/arm64/packages | 3 - .../profiles/coreos/arm64/parent | 3 - .../profiles/coreos/arm64/sdk/make.defaults | 2 - .../profiles/coreos/arm64/sdk/parent | 2 - .../profiles/coreos/arm64/use.mask | 1 - .../coreos/base/package.accept_keywords | 19 +++--- .../coreos/targets/sdk/package.use.mask | 4 -- .../coreos-overlay/profiles/profiles.desc | 5 -- 20 files changed, 7 insertions(+), 130 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/use.mask diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README deleted file mode 100644 index 0e500caef1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README +++ /dev/null @@ -1,4 +0,0 @@ -This profile (and its sub-profiles) should *only* contain -architecture specific settings. Architecture independent settings should -go under coreos/base (applies to everything) or coreos/targets/* -(applies to the sdk, amd64-usr, etc.). diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent deleted file mode 100644 index 35ac69992e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/generic/dev diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults deleted file mode 100644 index a7f431d3ca..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults +++ /dev/null @@ -1,2 +0,0 @@ -CFLAGS="-O2 -pipe -mtune=generic -g" -CXXFLAGS="${CFLAGS}" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent deleted file mode 100644 index cfacbaa8c8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/generic/oem-aci diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent deleted file mode 100644 index 767f085901..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/generic diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent deleted file mode 100644 index 89b629a19e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/generic/prod diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/make.defaults deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords deleted file mode 100644 index 4e7e344770..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ /dev/null @@ -1,63 +0,0 @@ -# arm64 keywords -# Keep these in alphabetical order. - -=app-arch/bzip2-1.0.6-r8 ~arm64 -=app-arch/libarchive-3.3.1 ~arm64 -=app-crypt/mit-krb5-1.14.2 ~arm64 -=app-text/asciidoc-8.6.9-r3 ~arm64 -=dev-cpp/gflags-2.2.0 ~arm64 -=dev-cpp/glog-0.3.4-r1 ~arm64 -=dev-lang/perl-5.24.1-r2 ~arm64 -=dev-lang/swig-3.0.12 ~arm64 -=dev-libs/apr-util-1.5.4-r1 ~arm64 -=dev-libs/elfutils-0.169-r1 ~arm64 -=dev-libs/libassuan-2.5.1 ~arm64 -=dev-libs/libevent-2.1.8 ~arm64 -=dev-libs/liblinear-210-r1 ~arm64 -=dev-libs/libnl-3.2.27 ~arm64 -=dev-libs/libpcre-8.41 ~arm64 -=dev-libs/libpcre2-10.30 ~arm64 -=dev-libs/libusb-1.0.21 ~arm64 -=dev-libs/nss-3.29.5 ~arm64 -=dev-libs/userspace-rcu-0.9.1 ** -=dev-perl/libintl-perl-1.240.0-r2 ~arm64 -=dev-perl/Text-Unidecode-1.270.0 ~arm64 -=dev-util/meson-0.43.0 ~arm64 -=dev-util/ninja-1.8.2 ~arm64 -=dev-util/re2c-0.16 ~arm64 -=net-analyzer/nmap-7.40 ~arm64 -=net-analyzer/tcpdump-4.9.2 ~arm64 -=net-dialup/minicom-2.7.1 ~arm64 -=net-dns/bind-tools-9.11.2_p1 ~arm64 -=net-dns/dnsmasq-2.78 ~arm64 -=net-firewall/ebtables-2.0.10.4-r1 ~arm64 -=net-firewall/ipset-6.29 ~arm64 -=net-libs/libmicrohttpd-0.9.52 ** -=net-libs/libnftnl-1.0.6 ** -=net-libs/serf-1.3.8-r1 ~arm64 -=net-misc/bridge-utils-1.5 ~arm64 -=net-misc/iperf-3.1.3 ** -=net-misc/socat-1.7.3.2 ~arm64 -=net-nds/openldap-2.4.44 ~arm64 -=perl-core/File-Path-2.130.0 ~arm64 -=sys-apps/i2c-tools-3.1.1-r1 ~arm64 -=sys-apps/lshw-02.17b-r2 ** -=sys-apps/man-db-2.7.6.1-r2 ~arm64 -=sys-apps/rng-tools-5-r2 ** -=sys-apps/sandbox-2.12 ~arm64 -=sys-apps/smartmontools-6.4 ** -=sys-block/parted-3.2-r1 ~arm64 -=sys-block/thin-provisioning-tools-0.7.0 ~arm64 -=sys-cluster/ipvsadm-1.27-r1 ** -=sys-fs/btrfs-progs-4.10.2 ~arm64 -=sys-fs/cryptsetup-1.7.5 ~arm64 -=sys-fs/lsscsi-0.28 ~arm64 -=sys-fs/mdadm-3.4 ** -=sys-fs/multipath-tools-0.6.4-r1 ~arm64 -=sys-fs/quota-4.04-r1 ~arm64 -=sys-libs/binutils-libs-2.29.1-r1 ~arm64 -=sys-libs/libcap-ng-0.7.8 ~arm64 -=virtual/krb5-0-r1 ~arm64 -=virtual/libudev-232 ~arm64 -=virtual/libusb-1-r2 ~arm64 -=virtual/perl-File-Path-2.130.0 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided deleted file mode 100644 index 2fdc03a5c7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided +++ /dev/null @@ -1,6 +0,0 @@ -# arm64 provided - -dev-libs/gobject-introspection-1.40.0-r1 - -# build errors -net-dns/bind-tools-9.11.2_p1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use deleted file mode 100644 index 1730b342ee..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use +++ /dev/null @@ -1,8 +0,0 @@ -# arm64 use - -# FIXME: why isn't this set by default??? -sys-libs/ncurses unicode - -sys-apps/systemd -selinux - -sys-auth/polkit -introspection diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force deleted file mode 100644 index 1947a2fd59..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force +++ /dev/null @@ -1,2 +0,0 @@ -sys-auth/polkit -introspection -sys-apps/systemd -introspection diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask deleted file mode 100644 index 97d928a576..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask +++ /dev/null @@ -1,5 +0,0 @@ -# This fails from -Werror=implicit-fallthrough, and it's disabled in the SDK. -sys-devel/gcc sanitize - -# Undo Gentoo masking all this on arm64. -sys-apps/systemd -cryptsetup -http -policykit -qrcode -xkb diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages deleted file mode 100644 index 511adccb20..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages +++ /dev/null @@ -1,3 +0,0 @@ -# Disable PAX utilities, we don't use grsec kernels --*sys-apps/paxctl --*sys-apps/elfix diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent deleted file mode 100644 index abb3d18940..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent +++ /dev/null @@ -1,3 +0,0 @@ -#portage-stable:hardened/linux/arm64 -- switch when available -portage-stable:default/linux/arm64 -:coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults deleted file mode 100644 index 01f715c2c2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults +++ /dev/null @@ -1,2 +0,0 @@ -CFLAGS="-O2 -pipe -mtune=generic" -CXXFLAGS="${CFLAGS}" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent deleted file mode 100644 index f0c938676d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/sdk diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/use.mask deleted file mode 100644 index ff5beb9b41..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/use.mask +++ /dev/null @@ -1 +0,0 @@ --ldap 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 a6a31f34a5..2726cb3ba8 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 @@ -21,11 +21,11 @@ dev-python/boto dev-util/checkbashisms # Older versions of sssd fail to build -=sys-auth/sssd-1.13.1 ~amd64 ~arm64 +=sys-auth/sssd-1.13.1 ~amd64 # heap overflow fix # https://bugs.gentoo.org/show_bug.cgi?id=580606 -=app-misc/jq-1.5-r2 ~amd64 ~arm64 +=app-misc/jq-1.5-r2 ~amd64 # Must use the same version across all architectures =dev-libs/protobuf-2.6.1-r3 @@ -42,7 +42,7 @@ dev-util/checkbashisms # systemd v238 requires libseccomp 2.3.3 =sys-libs/libseccomp-2.3.3 ** -# All versions are ~amd64 and not enabled on arm64 +# All versions are ~amd64 =sys-apps/nvme-cli-1.1 ** # CVE-2017-8779 @@ -53,14 +53,9 @@ dev-util/checkbashisms # iproute2 4.13 includes a patch to avoid leaking netns mounts in rkt # https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git/commit/?id=d6a4076b6ba6547d7e52c377a7c58c56eb5ea16e -=sys-apps/iproute2-4.13.0 ~amd64 ~arm64 - -# Upgrade to GCC 7.3 for retpoline support. -=sys-devel/gcc-7.3.0 -=cross-aarch64-cros-linux-gnu/gcc-7.3.0 ~arm64 -=cross-x86_64-cros-linux-gnu/gcc-7.3.0 ~amd64 +=sys-apps/iproute2-4.13.0 ~amd64 # Force upgrades to work around catalyst problems while upgrading ncurses. -=app-crypt/gnupg-2.2.7 ~amd64 ~arm64 -=sys-apps/gptfdisk-1.0.3 ~amd64 ~arm64 -=sys-apps/util-linux-2.32 ~amd64 ~arm64 +=app-crypt/gnupg-2.2.7 ~amd64 +=sys-apps/gptfdisk-1.0.3 ~amd64 +=sys-apps/util-linux-2.32 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask index 8e6ec6044f..811692a9e5 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask @@ -1,6 +1,2 @@ # Allow smartcard support in the SDK for image signing app-crypt/gnupg -smartcard - -# hardened and sanitize are masked for arm64, cross compilers should agree -cross-aarch64-cros-linux-gnu/gcc hardened sanitize -cross-aarch64-cros-linux-gnu/glibc hardened diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc b/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc index 1ef2a7e05b..0385f806b2 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc +++ b/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc @@ -4,8 +4,3 @@ amd64 coreos/amd64/generic/prod dev amd64 coreos/amd64/sdk dev amd64 default/linux/amd64/10.0 dev amd64 default/linux/amd64/10.0/coreos dev - -arm64 coreos/arm64/generic dev -arm64 coreos/arm64/generic/dev dev -arm64 coreos/arm64/generic/prod dev -arm64 coreos/arm64/sdk dev From b651d349b70bc8eeeb757ada6e05a5a39f19f90b Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 16:02:00 +0000 Subject: [PATCH 02/22] sys-apps/kexec-tools: Move back to portage-stable --- .../md5-cache/sys-apps/kexec-tools-2.0.16 | 14 -- .../sys-apps/kexec-tools/Manifest | 1 - .../sys-apps/kexec-tools/files/90_kexec | 9 - .../sys-apps/kexec-tools/files/README.Gentoo | 33 ---- .../kexec-tools-2.0.16-arm64-no-PIC.patch | 27 --- ...kexec-tools-2.0.4-disable-kexec-test.patch | 17 -- .../kexec-tools-2.0.4-out-of-source.patch | 24 --- .../sys-apps/kexec-tools/files/kexec.conf | 16 -- .../kexec-tools/files/kexec.conf-2.0.4 | 34 ---- .../kexec-tools/files/kexec.init-2.0.13-r1 | 186 ------------------ .../sys-apps/kexec-tools/files/kexec.service | 16 -- .../kexec-tools/kexec-tools-2.0.16.ebuild | 82 -------- .../sys-apps/kexec-tools/metadata.xml | 13 -- 13 files changed, 472 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.16 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/90_kexec delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/README.Gentoo delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.16-arm64-no-PIC.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.4-disable-kexec-test.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.4-out-of-source.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.conf delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.conf-2.0.4 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.service delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.16 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.16 deleted file mode 100644 index 3ee0c2b6b7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.16 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install postinst prepare setup -DEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib ) >=app-portage/elt-patches-20170815 virtual/pkgconfig -DESCRIPTION=Load another kernel from the currently executing Linux kernel -EAPI=6 -HOMEPAGE=https://kernel.org/pub/linux/utils/kernel/kexec/ -IUSE=booke lzma xen zlib kernel_linux -KEYWORDS=~amd64 ~arm64 ~x86 -LICENSE=GPL-2 -RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib ) -REQUIRED_USE=lzma? ( zlib ) -SLOT=0 -SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.16.tar.xz -_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs f164325a2cdb5b3ea39311d483988861 -_md5_=6811a0b93cdd4407f9c3a3ceb5e06877 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/Manifest deleted file mode 100644 index 63776aab10..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B 7e7bbe11dc2792be3cab6318c12b6866bf6b373fb7bf2d7601ef68a39dd5882aceab7c8905ce0d9b0af1da2072b3f3d2677bd9e006676c484e1d6506ac7036fa SHA512 f2f06e7702fef20c8d7d6aabe1b264e2e2689e5c38cc00dbc2186dd7fa0479edb2dc9e307dd2ad7f03db47015e966e577f11576172604ef01c1bcca471fe2c24 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/90_kexec b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/90_kexec deleted file mode 100644 index 40bad42395..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/90_kexec +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -version="$1" ; shift -image="$1" ; shift - -exec sed \ - -e "s:\"vmlinuz-.*\":\"vmlinuz-${version}\":" \ - -e "s:/boot/initramfs-.*\.img:/boot/initramfs-${version}\.img:" \ - -i /etc/kexec.conf diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/README.Gentoo b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/README.Gentoo deleted file mode 100644 index 7735e3275b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/README.Gentoo +++ /dev/null @@ -1,33 +0,0 @@ -Usage -===== - -Do - $ man 8 kexec -for full understanding of the underlying kexec command. -Gentoo offers a wrapper to the bare kexec command through -/etc/init.d/kexec. - -Configuration -------------- - -Configuration is done in /etc/conf.d/kexec, which is self-documented. - -Usage ------ - -In Gentoo, kexec is invoked, i.e., the new kernel will be booted when -rebooting, by reboot (8) command or by pressing Ctrl+Alt+Del. - -If you want to use kexec once, just run - $ /etc/init.d/kexec start - -It'll reserve kexec call at reboot. Later on, you can reboot anytime, -letting kexec starts another (or the same) kernel. When all is done in -the runlevel 6 - killing processes, unmounting volumes, etc - kexec -starts the new kernel instead of doing the normal hardware reboot. - -If you want kexec to be run every time you reboot, add it to a runlevel: - $ rc-update add kexec - -If you want to reboot in the normal way this time, do: - $ touch /nokexec diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.16-arm64-no-PIC.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.16-arm64-no-PIC.patch deleted file mode 100644 index fc1117dfab..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.16-arm64-no-PIC.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9d291e5a9425e23dd90c6fd79081bafd5bcd4c32 Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Sun, 7 Jan 2018 11:05:06 -0500 -Subject: [PATCH] arm64: Set -fno-PIC along with -mcmodel=large - -As seen in GCC's gcc/config/aarch64/aarch64.c, -fPIC with large -code model is unsupported. This fixes the "sorry, unimplemented" -errors when building with compilers defaulting to -fPIC. ---- - purgatory/arch/arm64/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/purgatory/arch/arm64/Makefile b/purgatory/arch/arm64/Makefile -index 636abea..80068ca 100644 ---- a/purgatory/arch/arm64/Makefile -+++ b/purgatory/arch/arm64/Makefile -@@ -1,6 +1,7 @@ - - arm64_PURGATORY_EXTRA_CFLAGS = \ - -mcmodel=large \ -+ -fno-PIC \ - -fno-stack-protector \ - -fno-asynchronous-unwind-tables \ - -Wundef \ --- -2.14.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.4-disable-kexec-test.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.4-disable-kexec-test.patch deleted file mode 100644 index 6fc73f2db1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.4-disable-kexec-test.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git kexec-tools-2.0.3/kexec_test/Makefile kexec-tools-2.0.3/kexec_test/Makefile -index fec6210..2ed4d51 100644 ---- kexec-tools-2.0.3/kexec_test/Makefile -+++ kexec-tools-2.0.3/kexec_test/Makefile -@@ -8,12 +8,6 @@ dist += kexec_test/Makefile $(KEXEC_TEST_SRCS) \ - kexec_test/x86-setup-legacy-pic.S - - BUILD_KEXEC_TEST = no --ifeq ($(ARCH),i386) --BUILD_KEXEC_TEST = yes --endif --ifeq ($(ARCH),x86_64) --BUILD_KEXEC_TEST = yes --endif - - ifeq ($(BUILD_KEXEC_TEST),yes) - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.4-out-of-source.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.4-out-of-source.patch deleted file mode 100644 index 64c6cd8ab4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec-tools-2.0.4-out-of-source.patch +++ /dev/null @@ -1,24 +0,0 @@ - Makefile.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index c1859d1..1aa8559 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -44,7 +44,7 @@ TARGET_CFLAGS = @TARGET_CFLAGS@ - - # Base compiler flags. These are extended by the subcomponent-Makefiles - # where necessary. --CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \ -+CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/include -I$(srcdir)/include -I$(srcdir)/util_lib/include \ - -Iinclude/ $($(ARCH)_CPPFLAGS) - CFLAGS = @CFLAGS@ -fno-strict-aliasing -Wall -Wstrict-prototypes - PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@ -@@ -77,6 +77,7 @@ pkgincludedir = $(includedir)/$(PACKAGE_NAME) - DESTDIR = - - srcdir = @srcdir@ -+top_builddir = @top_builddir@ - VPATH = .:$(srcdir) - - # install paths diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.conf deleted file mode 100644 index aa829b9c23..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.conf +++ /dev/null @@ -1,16 +0,0 @@ -# Kernel image pathname, relative from /boot. -KNAME="bzimage" - -# Additional arguments passed to kexec (8) -# Following arguments are support: -# -# --reuse-cmdline -# Use the current boot command line -# -# --command-line=string -# Use a different command line -# -# --initrd=file -# Specify an initrd to use -# -KEXEC_OPT_ARGS="--reuse-cmdline" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.conf-2.0.4 b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.conf-2.0.4 deleted file mode 100644 index b71ea2bae9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.conf-2.0.4 +++ /dev/null @@ -1,34 +0,0 @@ -# Load kexec kernel image into memory during shutdown instead of bootup -# (default: yes) -#LOAD_DURING_SHUTDOWN="yes" - -# Additional arguments passed to kexec (8) -#KEXEC_OPT_ARGS="" - -# Kernel image partition. Mounted automatically if not. -# (default: /boot) -#BOOTPART="/boot" - -# Root partition (should be autodetected) -#ROOTPART="/dev/hda3" - -# Kernel image pathname, relative from BOOTPART. -# If it's one of -# {kernel-genkernel,bzImage,vmlinuz,kernel}-, -# or bzImage, vmlinuz (without suffix), -# then it's automaticaly detected. -# Setting it to "-" will disable kexec. -#KNAME="vmlinuz-3.9.0" - -# Initrd -# Same automatic detection restriction as for KNAME apply. -# initramfs-genkernel-, -# initrd{,.img}-{,.img} -# will be detected. -#INITRD="/boot/fbsplash-emergence-1024x768" - -# Kernel parameters (should be autodetected) -#KPARAM="splash=silent,theme:emergence" - -# Do not try to mount /boot -# DONT_MOUNT_BOOT="yes" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 deleted file mode 100644 index 5415b3bc85..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 +++ /dev/null @@ -1,186 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Set up some defaults. -: "${LOAD_DURING_SHUTDOWN:=yes}" -: "${BOOTPART:=/boot}" -: "${DONT_MOUNT_BOOT:=no}" - -depend() { - need localmount -} - -auto_prefix_bootpath() { - # Only auto-add prefix to relative paths. - case $1 in - */*) echo "$1";; - *) echo "${BOOTPART}/$1" ;; - esac -} - -get_genkernel_arch() { - case $1 in - x86_64) echo "amd64" ;; - i[3456]86) echo "x86" ;; - *) echo "$1" ;; - esac -} - -image_path() { - # Do no sanity checking if the user has set a value. - if [ -n "${KNAME}" ]; then - auto_prefix_bootpath "${KNAME}" - return - fi - - local x kver="$(uname -r)" karch="$(uname -m)" - local gkarch="$(get_genkernel_arch $karch)" - for x in \ - "bzImage" \ - "vmlinuz" \ - "bzImage-${kver}" \ - "vmlinuz-${kver}" \ - "kernel-genkernel-${karch}-${kver}" \ - "kernel-genkernel-${gkarch}-${kver}" \ - "kernel-${kver}" \ - "kernel-${karch}"; do - if [ -e "${BOOTPART}/${x}" ]; then - echo "${BOOTPART}/${x}" - return - fi - done - - return 1 -} - -initrd_path() { - # Do no sanity checking if the user has set a value. - if [ -n "${INITRD}" ]; then - auto_prefix_bootpath "${INITRD}" - return 0 - fi - - local x kver="$(uname -r)" karch="$(uname -m)" - local gkarch="$(get_genkernel_arch $karch)" - for x in \ - "initrd" \ - "initrd.img-${kver}" \ - "initrd-${kver}.img" \ - "initrd-${kver}" \ - "initramfs-${kver}.img" \ - "initramfs-genkernel-${karch}-${kver}" \ - "initramfs-genkernel-${gkarch}-${kver}"; do - if [ -e "${BOOTPART}/${x}" ]; then - echo "${BOOTPART}/${x}" - return 0 - fi - done - - return 1 -} - -mount_boot() { - [ "${DONT_MOUNT_BOOT}" != "no" ] && return 1 - mountinfo -q "${BOOTPART}" && return 1 - - ebegin "Mounting ${BOOTPART}" - mount "${BOOTPART}" - eend $? -} - -load_image() { - if [ "${KNAME}" = "-" ]; then - ebegin "Disabling kexec" - kexec -u - eend $? - return # eend preserved $? for us. - fi - - local img initrd="$(initrd_path)" mounted=false kparamopt initrdopt - - if ! img="$(image_path)"; then - if mount_boot; then - if img="$(image_path)"; then - mounted=true - initrd="$(initrd_path)" - else - eerror "No kernel image found in ${BOOTPART}!" - umount "${BOOTPART}" - return 1 - fi - else - eerror "No kernel image found in ${BOOTPART}!" - return 1 - fi - fi - - if [ -z "${ROOTPART}" ]; then - ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")" - fi - - if [ -z "${KPARAM}" ]; then - kparamopt="--reuse-cmdline" - fi - - if [ -n "${initrd}" ]; then - initrdopt="--initrd=${initrd}" - fi - - local msg - [ -n "${initrd}" ] && \ - msg=" (with ${initrd})" - ebegin "Using kernel image ${img}${msg} for kexec" - - kexec ${KEXEC_OPT_ARGS} ${kparamopt} \ - -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt} - local ret=$? - - ${mounted} && umount "${BOOTPART}" - eend ${ret} - return ${ret} -} - -start() { - if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then - local mounted - if mount_boot; then - mounted=true - fi - if ! image_path >/dev/null; then - ewarn "Cannot find kernel image!" - ewarn "Please make sure a valid kernel image is present before reboot." - return 0 - fi - if [ -n "${mounted}" ]; then - ebegin "Unmounting ${BOOTPART}" - umount "${BOOTPART}" - eend $? - fi - # $? is already set to the previous calls. - return - else - load_image - fi -} - -stop() { - if ! yesno ${RC_REBOOT}; then - ebegin "Not rebooting; disabling kexec" - kexec -u - eend $? - return - fi - - if [ -f /nokexec ]; then - ebegin "Rebooting; disabling kexec due to /nokexec" - rm -f /nokexec - kexec -u - eend $? - return - fi - - if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then - load_image - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.service b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.service deleted file mode 100644 index 289aae0df0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/files/kexec.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Gracefully restart the box -Documentation=man:kexec(8) -After=boot.mount -Before=shutdown.target umount.target final.target -ConditionPathExists=!/nokexec - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/kexec.conf -ExecStart=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS} -ExecStop=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS} - -[Install] -WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild deleted file mode 100644 index db863c0ab3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" - AUTOTOOLS_AUTORECONF=true -else - SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -inherit libtool linux-info systemd - -DESCRIPTION="Load another kernel from the currently executing Linux kernel" -HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="booke lzma xen zlib" - -REQUIRED_USE="lzma? ( zlib )" - -DEPEND=" - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~KEXEC" - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch - "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch - "${FILESDIR}"/${P}-arm64-no-PIC.patch -) - -pkg_setup() { - # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) - export ASFLAGS="${CCASFLAGS}" -} - -src_prepare() { - default - elibtoolize -} - -src_configure() { - local myeconfargs=( - $(use_with booke) - $(use_with lzma) - $(use_with xen) - $(use_with zlib) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - dodoc "${FILESDIR}"/README.Gentoo - - newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec - newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec - - insinto /etc - doins "${FILESDIR}"/kexec.conf - - insinto /etc/kernel/postinst.d - doins "${FILESDIR}"/90_kexec - - systemd_dounit "${FILESDIR}"/kexec.service -} - -pkg_postinst() { - if systemd_is_booted || has_version sys-apps/systemd; then - elog "For systemd support the new config file is" - elog " /etc/kexec.conf" - elog "Please adopt it to your needs as there is no autoconfig anymore" - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/metadata.xml deleted file mode 100644 index 2ea57db782..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/kexec-tools/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - base-system@gentoo.org - Gentoo Base System - - - Enables support for LZMA compressed kernel images - Include support for Book-E memory management - Enable extended xen support - - From d0791d4a1276a4f789775ef74f20a6461407a8b9 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 16:10:35 +0000 Subject: [PATCH 03/22] dev-util/boost-build: Move back to portage-stable --- .../dev-util/boost-build/Manifest | 1 - .../boost-build/boost-build-1.65.0.ebuild | 140 ------------------ ...st-build-1.48.0-disable_python_rpath.patch | 11 -- ...build-1.49.0-darwin-gentoo-toolchain.patch | 26 ---- ...oost-build-1.50.0-respect-c_ld-flags.patch | 53 ------- ...ld-1.52.0-darwin-no-python-framework.patch | 17 --- .../files/boost-build-1.54.0-fix-test.patch | 11 -- ....54.0-support_dots_in_python-buildid.patch | 19 --- .../files/boost-build-1.55.0-ppc-aix.patch | 13 -- .../boost-build/files/site-config.jam | 11 -- .../dev-util/boost-build/metadata.xml | 11 -- .../md5-cache/dev-util/boost-build-1.65.0 | 15 -- 12 files changed, 328 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/boost-build-1.65.0.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/site-config.jam delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/boost-build-1.65.0 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/Manifest deleted file mode 100644 index c067889f88..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/boost-build-1.65.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/boost-build-1.65.0.ebuild deleted file mode 100644 index 1ef8c4e0b6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/boost-build-1.65.0.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -RESTRICT="test" - -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator - -MY_PV="$(replace_all_version_separators _)" - -DESCRIPTION="A system for large project software construction, simple to use and powerful" -HOMEPAGE="http://www.boost.org/doc/tools/build/index.html" -SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples python test" - -RDEPEND="python? ( ${PYTHON_DEPS} ) - !/dev/null || die - eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch" - popd >/dev/null || die - - # Remove stripping option - # Fix python components build on multilib systems, bug #496446 - cd "${S}/engine" || die - sed -i \ - -e 's|-s\b||' \ - -e "/libpython/s/lib ]/$(get_libdir) ]/" \ - build.jam || die "sed failed" - - # Force regeneration - rm jambase.c || die - - # This patch allows us to fully control optimization - # and stripping flags when bjam is used as build-system - # We simply extend the optimization and debug-symbols feature - # with empty dummies called 'none' - cd "${S}" || die - sed -i \ - -e 's/\(off speed space\)/\1 none/' \ - -e 's/\(debug-symbols : on off\)/\1 none/' \ - tools/builtin.jam || die "sed failed" -} - -src_configure() { - if use python; then - # replace versions by user-selected one (TODO: fix this when slot-op - # deps are available to always match the best version available) - sed -i \ - -e "s|27 26 25 24 23 22|${EPYTHON#python}|" \ - engine/build.jam || die "sed failed" - fi -} - -src_compile() { - cd engine || die - - local toolset - - if [[ ${CHOST} == *-darwin* ]]; then - toolset=darwin - else - # Using boost's generic toolset here, which respects CC and CFLAGS - toolset=cc - fi - - tc-is-cross-compiler && sed -i -e 's/BOOST_JAM_CC=\$CC$/BOOST_JAM_CC=cc/' build.sh - CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed" -} - -src_install() { - dobin engine/bin.*/{bjam,b2} - - insinto /usr/share/boost-build - doins -r "${FILESDIR}/site-config.jam" \ - ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \ - build kernel options tools util - - if ! use python; then - find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed" - fi - - dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt - - if use examples; then - docinto examples - dodoc -r ../example/. - docompress -x /usr/share/doc/${PF}/examples - fi -} - -src_test() { - cd ../test || die - - export TMP="${T}" - - DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py - - if [[ -s test_results.txt ]]; then - eerror "At least one test failed: $($(set-PYTHONPATH) -- $(libraries) $(dll-path) python.lib -+ $(libraries) python.lib - ; - } - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch deleted file mode 100644 index 032feaf962..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch +++ /dev/null @@ -1,26 +0,0 @@ -Avoid adding all kinds of things to the toolchain's flags that within -Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target, -arch, etc. - ---- a/tools/darwin.jam -+++ b/tools/darwin.jam -@@ -227,6 +227,9 @@ - } - } - -+ # leave compiler flags etc. up to the toolchain -+ return $(version-feature) ; -+ - if $(version-feature) - { - if $(.debug-configuration) -@@ -387,7 +390,8 @@ - support-ppc64 = ; - } - } -- switch $(arch) -+ # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either -+ switch $(donotaddarchpleaseXXXarch) - { - case combined : - { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch deleted file mode 100644 index 8775583cbc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/engine/build.jam -+++ b/engine/build.jam -@@ -3,7 +3,7 @@ - #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - - # Clean env vars of any "extra" empty values. --for local v in ARGV CC CFLAGS LIBS -+for local v in ARGV CC CFLAGS LDFLAGS LIBS - { - local values ; - for local x in $($(v)) -@@ -179,10 +179,10 @@ - if ! $(CC) { CC = cc ; } - toolset cc $(CC) : "-o " : -D - : $(CFLAGS) -- [ opt --release : -s -O ] -+ [ opt --release : ] - [ opt --debug : -g ] - -I$(--python-include) -I$(--extra-include) -- : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; -+ : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; - ## Comeau C/C++ 4.x - toolset como como : "-o " : -D - : --c -@@ -201,11 +201,11 @@ - ## MacOSX Darwin, using GCC 2.9.x, 3.x - toolset darwin cc : "-o " : -D - : -- [ opt --release : -Wl,-x -O3 -finline-functions ] -+ [ opt --release : -Wl,-x -finline-functions ] - [ opt --debug : -g -O0 -fno-inline -pg ] - [ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ] - -I$(--python-include) -I$(--extra-include) -- : -L$(--python-lib[1]) -l$(--python-lib[2]) ; -+ : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; - ## GCC 2.x, 3.x, 4.x - toolset gcc gcc : "-o " : -D - : -pedantic -fno-strict-aliasing ---- a/engine/build.sh -+++ b/engine/build.sh -@@ -224,9 +224,9 @@ - cc) - if test -z "$CC" ; then CC=cc ; fi - BOOST_JAM_CC=$CC -- BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS" -- BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS" -- BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS" -+ BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS" -+ BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS" -+ BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS" - ;; - - qcc) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch deleted file mode 100644 index cacbe00a7e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch +++ /dev/null @@ -1,17 +0,0 @@ -Don't look for the framework path, we build Python the UNIX way for -Gentoo Prefix - ---- a/engine/build.jam -+++ b/engine/build.jam -@@ -82,11 +82,6 @@ - } - --python-lib = $(--python-lib[1]) ; - } -- else if $(OS) = MACOSX -- { -- --python-include = [ .path $(python-location) Headers ] ; -- --python-lib = $(python-location) Python ; -- } - else - { - --python-include = ; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch deleted file mode 100644 index 3f8b177c71..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/test/startup_v2.py -+++ b/test/startup_v2.py -@@ -50,7 +50,7 @@ - return re.match(expected, actual, re.DOTALL) != None - - --t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0) -+t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0) - t.set_tree("startup") - check_for_existing_boost_build_jam(t) - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch deleted file mode 100644 index a04aa0b7aa..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/tools/common.jam -+++ b/tools/common.jam -@@ -763,7 +763,15 @@ - switch $(f:G) - { - case : -- result += $(name:B) ; -+ local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ; -+ if $(matched) = boost_python || $(matched) = boost_mpi_python -+ { -+ result += $(name) ; -+ } -+ else -+ { -+ result += $(name:B) ; -+ } - - case : - result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) : diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch deleted file mode 100644 index d8b6a5af1e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://svn.boost.org/trac/boost/ticket/10122 - ---- a/engine/mem.h -+++ b/engine/mem.h -@@ -8,6 +8,8 @@ - #ifndef BJAM_MEM_H - #define BJAM_MEM_H - -+#include "jam.h" -+ - #ifdef OPT_BOEHM_GC - - /* Use Boehm GC memory allocator. */ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/site-config.jam b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/site-config.jam deleted file mode 100644 index 6afe52684c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/site-config.jam +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -# Define two new variants to be used when building boost (or separate boost-libs) -# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols -# values "none" which are not part of the official boost distribution. -# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS! -variant gentoorelease : release : none none shared ; -variant gentoodebug : debug : none on shared ; - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/metadata.xml deleted file mode 100644 index ef3f9148d5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - cpp@gentoo.org - Gentoo C++ Project - - - boost - - diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/boost-build-1.65.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/boost-build-1.65.0 deleted file mode 100644 index 76accf7680..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/boost-build-1.65.0 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -DESCRIPTION=A system for large project software construction, simple to use and powerful -EAPI=6 -HOMEPAGE=http://www.boost.org/doc/tools/build/index.html -IUSE=examples python test python_targets_python2_7 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=Boost-1.0 -RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ! Date: Tue, 16 Oct 2018 16:36:43 +0000 Subject: [PATCH 04/22] net-libs/rpcsvc-proto: Move back to portage-stable --- .../md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 | 12 ------- .../net-libs/rpcsvc-proto/Manifest | 1 - .../rpcsvc-proto-1.3.1-old-preprocessor.patch | 31 ------------------ .../net-libs/rpcsvc-proto/metadata.xml | 12 ------- .../rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild | 32 ------------------- 5 files changed, 88 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 deleted file mode 100644 index a7d7b0e6d5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=rpcsvc protocol definitions from glibc -EAPI=6 -HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto -KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 -LICENSE=LGPL-2.1+ BSD -RDEPEND=! rpcsvc-proto-1.3.1.tar.gz -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861 -_md5_=c284466948308c510033e6084c256ca6 diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/Manifest b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/Manifest deleted file mode 100644 index 33b4e5b8c1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f1322bc794dbc95c1b78d088396c5adda292c83d150f3502df859c23d4e370894283ae210e5fe9aa1d0e8ed05553d0 SHA512 d687665ed51fd6fd66ab638813c5020f0c8b8491625b91937ac4b5ee4dd2357eae8e2909394e7651494e7aea77a6279ae907ba6354682ba446de7088b55f54ea diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch deleted file mode 100644 index 5d77786a71..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ce0ed4f45918f9230db435ee3b733090fa4f9620 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Tue, 27 Mar 2018 12:08:30 +0200 -Subject: [PATCH] Remove historic _RPC_THREAD_SAFE_ preprocessor conditional - -When the code was imported from glibc, the -D_RPC_THREAD_SAFE_ -build flag was missed. ---- - rpcgen/rpc_main.c | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c -index 94bd818..1b26e52 100644 ---- a/rpcgen/rpc_main.c -+++ b/rpcgen/rpc_main.c -@@ -1346,15 +1346,6 @@ parseargs (int argc, const char *argv[], struct commandline *cmd) - cmd->Scflag = flag['C']; - cmd->makefileflag = flag['M']; - --#ifndef _RPC_THREAD_SAFE_ -- if (mtflag || newstyle) -- { -- /* glibc doesn't support these flags. */ -- f_print (stderr, -- _("This implementation doesn't support newstyle or MT-safe code!\n")); -- return (0); -- } --#endif - if (tirpcflag) - { - pmflag = inetdflag ? 0 : 1; /* pmflag or inetdflag is always TRUE */ diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/metadata.xml deleted file mode 100644 index bcf493eae9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - toolchain@gentoo.org - Gentoo Toolchain Project - - - base-system@gentoo.org - Gentoo Base System Project - - diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild deleted file mode 100644 index bb3a5b3dea..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="rpcsvc protocol definitions from glibc" -HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto" -SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="LGPL-2.1+ BSD" -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86" -IUSE="" - -RDEPEND="! Date: Tue, 16 Oct 2018 16:39:18 +0000 Subject: [PATCH 05/22] dev-util/catalyst: Move back to portage-stable --- .../coreos-overlay/dev-util/catalyst/Manifest | 1 - .../catalyst/catalyst-2.0.18-r6.ebuild | 120 ------------------ ...atalyst-2.0.18-Do-notuntarwith--acls.patch | 95 -------------- .../files/catalyst-2.0.18-fix-quotes.patch | 38 ------ .../catalyst-2.0.18-remove-machine-id.patch | 25 ---- .../catalyst-2.0.18-stage1-export-ROOT.patch | 42 ------ .../dev-util/catalyst/metadata.xml | 14 -- .../md5-cache/dev-util/catalyst-2.0.18-r6 | 14 -- 8 files changed, 349 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r6.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r6 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/Manifest deleted file mode 100644 index f3f9902781..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r6.ebuild deleted file mode 100644 index 98e502b926..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r6.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git" - EGIT_MASTER="master" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib python-single-r1 ${SRC_ECLASS} - -DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ccache kernel_linux" - -DEPEND=" - app-text/asciidoc - ${PYTHON_DEPS} -" -RDEPEND=" - app-arch/lbzip2 - app-crypt/shash - app-arch/tar[xattr] - sys-fs/dosfstools - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) - ${PYTHON_DEPS} -" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -PATCHES=( - "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" - "${FILESDIR}/catalyst-2.0.18-fix-quotes.patch" - "${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch" - "${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch" -) - -pkg_setup() { - if use ccache ; then - einfo "Enabling ccache support for catalyst." - else - ewarn "By default, ccache support for catalyst is disabled." - ewarn "If this is not what you intended," - ewarn "then you should add ccache to your USE." - fi - - echo - einfo "The template spec files are now installed by default. You can find" - einfo "them under /usr/share/doc/${PF}/examples" - einfo "and they are considered to be the authorative source of information" - einfo "on catalyst." - echo - - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_install() { - insinto /usr/$(get_libdir)/${PN} - exeinto /usr/$(get_libdir)/${PN} - doexe catalyst || die "copying catalyst" - - if [[ ${PV} == 3.9999* ]]; then - doins -r modules files || die "copying files" - else - doins -r arch modules livecd || die "copying files" - fi - - for x in targets/*; do - exeinto /usr/$(get_libdir)/${PN}/$x - doexe $x/* || die "copying ${x}" - done - - # Here is where we actually enable ccache - use ccache && \ - sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ - files/catalyst.conf - - sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - files/catalyst.conf - - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst - insinto /etc/catalyst - doins files/catalyst.conf files/catalystrc || die "copying configuration" - insinto /usr/share/doc/${PF}/examples - doins examples/* || die - dodoc README AUTHORS - doman files/catalyst.1 files/catalyst-spec.5 - - python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" - python_optimize "${ED}" -} - -pkg_postinst() { - einfo "You can find more information about catalyst by checking out the" - einfo "catalyst project page at:" - einfo "https://wiki.gentoo.org/wiki/Catalyst" -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch deleted file mode 100644 index f4cbcfbb7d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" -Date: Sun, 18 Jan 2015 22:21:16 -0500 -Subject: [PATCH] Do not untar with --acls, fixes bug #536762 -To: gentoo-catalyst@lists.gentoo.org - ---- - modules/catalyst_support.py | 6 +++--- - modules/generic_stage_target.py | 18 +++++++++--------- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py -index 0e9faac..702887d 100644 ---- a/modules/catalyst_support.py -+++ b/modules/catalyst_support.py -@@ -108,9 +108,9 @@ contents_map={ - # 'find' is disabled because it requires the source path, which is not - # always available - #"find" :[calc_contents,"find %(path)s"], -- "tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"], -- "tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"], -- "tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"], -+ "tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"], -+ "tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"], -+ "tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"], - "isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"], - # isoinfo-f should be a last resort only - "isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"], -diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py -index c7db027..cc24c63 100644 ---- a/modules/generic_stage_target.py -+++ b/modules/generic_stage_target.py -@@ -660,10 +660,10 @@ class generic_stage_target(generic_target): - self.settings["chroot_path"]+\ - " (This may take some time) ...\n" - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - error_msg="Tarball extraction of "+\ - self.settings["source_path"]+" to "+\ -@@ -675,10 +675,10 @@ class generic_stage_target(generic_target): - self.settings["chroot_path"]+\ - " (This may take some time) ...\n" - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - error_msg="Tarball extraction of "+self.settings["source_path"]+\ - " to "+self.settings["chroot_path"]+" failed." -@@ -777,9 +777,9 @@ class generic_stage_target(generic_target): - "catalyst-hash") - destdir=self.settings["snapshot_cache_path"] - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir - unpack_errmsg="Error unpacking snapshot" - cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ - self.settings["snapshot_cache_path"]+\ -@@ -796,10 +796,10 @@ class generic_stage_target(generic_target): - cleanup_msg=\ - "Cleaning up existing portage tree (This can take a long time)..." - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ - self.settings["chroot_path"]+"/usr" - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ - self.settings["chroot_path"]+"/usr" - unpack_errmsg="Error unpacking snapshot" - -@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target): - - print "Creating stage tarball..." - -- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ -+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ - self.settings["stage_path"]+" .",\ - "Couldn't create stage tarball",env=self.env) - --- -2.2.2 - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch deleted file mode 100644 index ccaffbe6b0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1eabce3a9c15c5caf022e71c1959e8c8f4819fad Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" -Date: Thu, 3 Mar 2016 20:48:43 -0500 -Subject: [PATCH] targets/support/chroot-functions.sh: correct quotes to allow - expansion of $1 - -This is a backport of commit b2473eff. The single quotes prevented the proper -expansion of $1 in setup_pkgmgr(). Since this is usually called as -`setup_pkgmgr "build"` during stage1 builds, it is surprising this was -not caught earlier. ---- - targets/support/chroot-functions.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh -index 3b7f77b..6c1a31c 100755 ---- a/targets/support/chroot-functions.sh -+++ b/targets/support/chroot-functions.sh -@@ -172,12 +172,12 @@ setup_pkgmgr(){ - # Use --update or portage might just waste time/cycles and reinstall the same version. - # Use --newuse to make sure it rebuilds with any changed use flags. - if [ -n "$1" ];then -- echo "Adding USE='${USE} $1' to make.conf for portage build" -- [ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf -+ echo "Adding USE=\"${USE} $1\" to make.conf for portage build" -+ [ -e /etc/portage/make.conf ] && echo "USE=\"\${USE} $1\"" >> /etc/portage/make.conf - run_merge --oneshot --update --newuse sys-apps/portage -- sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf -+ sed -i "/USE=\"\${USE} $1\"/d" /etc/portage/make.conf - else -- echo "Updating portage with USE='${USE}'" -+ echo "Updating portage with USE=\"${USE}\"" - run_merge --oneshot --update --newuse sys-apps/portage - fi - } --- -2.4.10 - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch deleted file mode 100644 index 1c641fd2b9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fbf94254a714c8d72840faee42cf348eb69b1a43 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" -Date: Fri, 8 Apr 2016 17:58:15 -0400 -Subject: [PATCH] targets/support/chroot-functions.sh: remove machine-id for - systemd stages - ---- - targets/support/chroot-functions.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh -index 6c1a31c..67874a0 100755 ---- a/targets/support/chroot-functions.sh -+++ b/targets/support/chroot-functions.sh -@@ -223,6 +223,7 @@ cleanup_stages() { - stage1|stage2|stage3|system) - rm -f /var/lib/portage/world - touch /var/lib/portage/world -+ rm -f /etc/machine-id - ;; - *) - echo "Skipping removal of world file for ${clst_target}" --- -2.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch deleted file mode 100644 index 67fc2c631b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5fd2d5edd3c4c1e99687beb9acc130bab162866b Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" -Date: Sat, 4 Jun 2016 12:43:44 -0400 -Subject: stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for - setup_gcc() - -setup_gcc() calls gcc-config to select a particular gcc profile. At stage1 this -needs to be done in the /tmp/stage1root chroot. gcc-config looks for ROOT to -choose the root directory in which to make the selection. If we don't export -ROOT, then setup_gcc is ineffective. - -X-Gentoo-Bug: 584234 -X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234 - -Signed-off-by: Anthony G. Basile ---- - targets/stage1/stage1-preclean-chroot.sh | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh -index a80fc92..dc67521 100755 ---- a/targets/stage1/stage1-preclean-chroot.sh -+++ b/targets/stage1/stage1-preclean-chroot.sh -@@ -1,5 +1,6 @@ - #!/bin/bash - -+export ROOT=/tmp/stage1root - export RUN_DEFAULT_FUNCS="no" - - source /tmp/chroot-functions.sh -@@ -8,8 +9,6 @@ update_env_settings - show_debug - - # Now, some finishing touches to initialize gcc-config.... --unset ROOT -- - setup_gcc - setup_binutils - --- -cgit v0.12 - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/metadata.xml deleted file mode 100644 index 6c4b9cdbcc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - catalyst@gentoo.org - - - livecd@gentoo.org - Gentoo LiveCD Project - - - Enables ccache support - - diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r6 deleted file mode 100644 index fd923caadc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r6 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=install postinst prepare setup -DEPEND=app-text/asciidoc python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] -DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux -EAPI=5 -HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst -IUSE=ccache kernel_linux python_targets_python2_7 -KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] sys-fs/dosfstools virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] -REQUIRED_USE=python_targets_python2_7 -SLOT=0 -SRC_URI=mirror://gentoo/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-2.0.18.tar.bz2 -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=c71150e9d8822360aeb45bb306aa7efe From 77cda40f96194e14b54e7ace81455f1c2f59dd41 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 16:44:22 +0000 Subject: [PATCH 06/22] sys-process/criu: Drop dead package --- .../metadata/md5-cache/sys-process/criu-0.5 | 13 ---- .../metadata/md5-cache/sys-process/criu-0.6 | 13 ---- .../coreos-overlay/sys-process/criu/ChangeLog | 10 --- .../coreos-overlay/sys-process/criu/Manifest | 2 - .../sys-process/criu/criu-0.5.ebuild | 47 ------------- .../sys-process/criu/criu-0.6.ebuild | 43 ------------ .../criu/files/crtools-0.4-flags.patch | 68 ------------------- .../sys-process/criu/metadata.xml | 8 --- 8 files changed, 204 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.5 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.6 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-process/criu/ChangeLog delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-process/criu/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-process/criu/criu-0.5.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-process/criu/criu-0.6.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-process/criu/files/crtools-0.4-flags.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-process/criu/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.5 deleted file mode 100644 index 0bf03d7239..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.5 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install prepare test -DEPEND=dev-libs/protobuf-c app-text/asciidoc app-text/xmlto -DESCRIPTION=utility to checkpoint/restore a process tree -EAPI=5 -HOMEPAGE=http://criu.org/ -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=dev-libs/protobuf-c -RESTRICT=test -SLOT=0 -SRC_URI=http://download.openvz.org/criu/criu-0.5.tar.bz2 -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=f0065f92f9919254026ec0219a650721 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.6 deleted file mode 100644 index 084f2e585f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.6 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install test -DEPEND=dev-libs/protobuf-c app-text/asciidoc app-text/xmlto -DESCRIPTION=utility to checkpoint/restore a process tree -EAPI=5 -HOMEPAGE=http://criu.org/ -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=dev-libs/protobuf-c -RESTRICT=test -SLOT=0 -SRC_URI=http://download.openvz.org/criu/criu-0.6.tar.bz2 -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=f2d1e370a9b64811e969cb9dfcb428ec diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-process/criu/ChangeLog deleted file mode 100644 index 71a5b29694..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -# ChangeLog for sys-process/criu -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.1 2013/05/03 07:51:26 radhermit Exp $ - -*criu-0.5 (03 May 2013) - - 03 May 2013; Tim Harder - +files/crtools-0.4-flags.patch, +criu-0.5.ebuild, +metadata.xml: - Upstream rename and version bump of sys-process/crtools. - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-process/criu/Manifest deleted file mode 100644 index 743b26601d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST criu-0.5.tar.bz2 262342 SHA256 23d4717a151be0233fdf7e66ad5bf4f4f01f48abec93c5f3189b984b8a3377a5 SHA512 1d3d3ea0116153511a6c0c0198dc7994beb4ae6af5d2bca4ccf05532b1426bff7e96c75ca773e66a63f987de73357bc5cfe8bd645dd0acbf134f2bd66d0abe68 WHIRLPOOL eb91aa4ad24bfbc9603f9b9078f2b9a82ef228d5a6d66d558ebf9adae245f10b93071eb7ad9e4f39beaefccfc6f5cc3d8a765e8e69ee21821a62148ffa03e7a7 -DIST criu-0.6.tar.bz2 277717 SHA256 95354cf2140ac82c0b6b7b0efc0825ec84dab7dbb03c171d0a109229d0dbf730 SHA512 74710cf0472213db2a7300c4d69e2befb6bbe1d4d1e60dc53ad25bcfd3580b6cbe651e9372693649e13a4246227b593197f22696c044aaa1655e946253321443 WHIRLPOOL 736f177f88dda513bac9f328fff52689302e791317223b00b718baae7a558b161a61b746e7e7035bfeb6dcf5a3cd2053b97374a48d0e89683d07c2c2b3422c31 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/criu-0.5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-process/criu/criu-0.5.ebuild deleted file mode 100644 index 4dcfdf7bc4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/criu-0.5.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-0.5.ebuild,v 1.1 2013/05/03 07:51:26 radhermit Exp $ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="utility to checkpoint/restore a process tree" -HOMEPAGE="http://criu.org/" -SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-libs/protobuf-c" -DEPEND="${RDEPEND} - app-text/asciidoc - app-text/xmlto" - -CONFIG_CHECK="~CHECKPOINT_RESTORE ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER - ~UNIX_DIAG ~INET_DIAG ~PACKET_DIAG" - -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}"/crtools-0.4-flags.patch -} - -src_compile() { - unset ARCH - emake CC="$(tc-getCC)" V=1 WERROR=0 all docs -} - -src_test() { - # root privileges are required to dump all necessary info - if [[ ${EUID} -eq 0 ]] ; then - emake -j1 CC="$(tc-getCC)" V=1 WERROR=0 test - fi -} - -src_install() { - dobin ${PN} - dodoc CREDITS README - newman Documentation/crtools.1 ${PN}.1 -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/criu-0.6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-process/criu/criu-0.6.ebuild deleted file mode 100644 index 81eccd4a31..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/criu-0.6.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-0.5.ebuild,v 1.1 2013/05/03 07:51:26 radhermit Exp $ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="utility to checkpoint/restore a process tree" -HOMEPAGE="http://criu.org/" -SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="dev-libs/protobuf-c" -DEPEND="${RDEPEND} - app-text/asciidoc - app-text/xmlto" - -CONFIG_CHECK="~CHECKPOINT_RESTORE ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER - ~UNIX_DIAG ~INET_DIAG ~PACKET_DIAG" - -RESTRICT="test" - -src_compile() { - unset ARCH - emake CC="$(tc-getCC)" V=1 WERROR=0 all docs -} - -src_test() { - # root privileges are required to dump all necessary info - if [[ ${EUID} -eq 0 ]] ; then - emake -j1 CC="$(tc-getCC)" V=1 WERROR=0 test - fi -} - -src_install() { - dobin ${PN} - dodoc CREDITS README - newman Documentation/criu.8 ${PN}.8 -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/files/crtools-0.4-flags.patch b/sdk_container/src/third_party/coreos-overlay/sys-process/criu/files/crtools-0.4-flags.patch deleted file mode 100644 index c52374ea0f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/files/crtools-0.4-flags.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- crtools-0.4/Makefile -+++ crtools-0.4/Makefile -@@ -90,13 +90,6 @@ - WARNINGS += -Werror - endif - --ifeq ($(DEBUG),1) -- DEFINES += -DCR_DEBUG -- CFLAGS += -O0 -ggdb3 --else -- CFLAGS += -O2 --endif -- - CFLAGS += $(WARNINGS) $(DEFINES) - SYSCALL-LIB := arch/$(ARCH)/syscalls.built-in.o - ARCH-LIB := arch/$(ARCH)/crtools.built-in.o -@@ -148,7 +141,7 @@ - - $(PROGRAM): $(SYSCALL-LIB) $(ARCH-LIB) pie/util-net.o protobuf/built-in.o built-in.o - $(E) " LINK " $@ -- $(Q) $(CC) $(CFLAGS) $^ $(LIBS) -o $@ -+ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@ - - zdtm: all - $(Q) $(MAKE) -C test/zdtm all ---- crtools-0.4/test/zdtm/lib/Makefile -+++ crtools-0.4/test/zdtm/lib/Makefile -@@ -1,6 +1,6 @@ - include ../Makefile.inc - --CFLAGS = -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -+CFLAGS = -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 - - LIB = libzdtmtst.a - ---- crtools-0.4/test/zdtm/live/static/Makefile -+++ crtools-0.4/test/zdtm/live/static/Makefile -@@ -3,7 +3,7 @@ - LIBDIR = ../../lib - LIB = $(LIBDIR)/libzdtmtst.a - override CPPFLAGS += -I$(LIBDIR) --CFLAGS = -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -+CFLAGS = -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 - - TST_NOFILE = \ - busyloop00 \ ---- crtools-0.4/test/zdtm/live/streaming/Makefile -+++ crtools-0.4/test/zdtm/live/streaming/Makefile -@@ -3,7 +3,7 @@ - LIBDIR = ../../lib - LIB = $(LIBDIR)/libzdtmtst.a - override CPPFLAGS += -I$(LIBDIR) --CFLAGS = -g -O2 -Wall -Werror -fno-strict-aliasing -+CFLAGS = -Wall -fno-strict-aliasing - - TST_NOFILE = \ - pipe_loop00 \ ---- crtools-0.4/test/zdtm/live/transition/Makefile -+++ crtools-0.4/test/zdtm/live/transition/Makefile -@@ -3,7 +3,7 @@ - LIBDIR = ../../lib - LIB = $(LIBDIR)/libzdtmtst.a - override CPPFLAGS += -I$(LIBDIR) --CFLAGS = -g -O2 -Wall -Werror -+CFLAGS = -Wall - - TST_NOFILE = \ - file_read \ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-process/criu/metadata.xml deleted file mode 100644 index efa5eb0078..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-process/criu/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - radhermit@gentoo.org - Tim Harder - - From 95ab688a5ef5761f536d36e48c436a3737c21dd0 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 16:49:59 +0000 Subject: [PATCH 07/22] sys-apps/iotools: Drop dead package --- .../md5-cache/sys-apps/iotools-1.2-r2 | 11 ----- .../coreos-overlay/sys-apps/iotools/Manifest | 1 - .../iotools/files/iotools-1.2.nopie.patch | 12 ----- .../sys-apps/iotools/iotools-1.2-r2.ebuild | 48 ------------------- .../sys-apps/iotools/metadata.xml | 10 ---- 5 files changed, 82 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/files/iotools-1.2.nopie.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/iotools-1.2-r2.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2 deleted file mode 100644 index 00b21e9ff7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile install -DESCRIPTION=Simple commands to access hardware device registers -EAPI=0 -HOMEPAGE=http://code.google.com/p/iotools/ -IUSE=hardened -KEYWORDS=x86 amd64 -LICENSE=GPL-2 -SLOT=0 -SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/iotools-1.2.tar.gz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=622bd785753b621d7210cf24cf074237 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/Manifest deleted file mode 100644 index 1d067c094b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST iotools-1.2.tar.gz 21514 SHA256 e4a961fea98c8e545982372732d486e8f118afa809da449816378a397d6be001 SHA512 fe52e28e2a1c5a039dccbd405e7e1eb1dcf1d2fd6584932379590bcffc92d65d0bf8827b716a3cd36bf6bf725619f7484d04d157a50b73bce3b76d031cc2ab54 WHIRLPOOL 3918e21d3dd9d8c895a4fe9c1dc13064df177aa03c321236c645f287d0b51bf200ca3b4f36b2cb6889aa4fe37d9aa42db3eee41146b19814ecc0b56e9ee724fb diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/files/iotools-1.2.nopie.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/files/iotools-1.2.nopie.patch deleted file mode 100644 index eef4b399e8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/files/iotools-1.2.nopie.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Makefile Makefile ---- Makefile 2009-04-09 12:33:32.000000000 -0700 -+++ Makefile 2010-05-14 15:14:25.000000000 -0700 -@@ -33,7 +33,7 @@ - IOTOOLS_DEBUG = -O2 -DNDEBUG - endif - --CFLAGS = -Wall -Werror $(DEFS) $(ARCHFLAGS) $(IOTOOLS_STATIC) $(IOTOOLS_DEBUG) -+CFLAGS = -Wall -Werror $(DEFS) $(ARCHFLAGS) $(IOTOOLS_STATIC) $(IOTOOLS_DEBUG) -nopie - DEFS = -D_GNU_SOURCE -DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR) - SBINDIR ?= /usr/local/sbin - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/iotools-1.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/iotools-1.2-r2.ebuild deleted file mode 100644 index 02807619ee..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/iotools-1.2-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2010 Google Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Simple commands to access hardware device registers" -HOMEPAGE="http://code.google.com/p/iotools/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="hardened" - -SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz" - -src_compile() { - # If we are on hardened/x86, turn off PIE because the code uses %ebx - if use x86 ; then - if use hardened ; then - epatch "${FILESDIR}"/iotools-1.2.nopie.patch - fi - fi - - emake CC="$(tc-getCC)" || die "emake failed" -} - -IOTOOLS_COMMANDS="and btr bts busy_loop cmos_read cmos_write cpu_list \ - cpuid io_read16 io_read32 io_read8 io_write16 io_write32 \ - io_write8 mmio_dump mmio_read16 mmio_read32 mmio_read64 \ - mmio_read8 mmio_write16 mmio_write32 mmio_write64 \ - mmio_write8 not or pci_list pci_read16 pci_read32 pci_read8 \ - pci_write16 pci_write32 pci_write8 rdmsr rdtsc runon shl \ - shr smbus_quick smbus_read16 smbus_read8 smbus_readblock \ - smbus_receive_byte smbus_send_byte smbus_write16 \ - smbus_write8 smbus_writeblock wrmsr xor" - -src_install() { - dosbin iotools || die - - echo "installing symbolic link shortcuts for iotools" - # Note: This is done manually because invoking the iotools binary - # when cross-compiling will likely fail. - cd "${D}/usr/sbin" - for COMMAND in ${IOTOOLS_COMMANDS} ; do - ln -s iotools ${COMMAND} - done -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/metadata.xml deleted file mode 100644 index 8c8fbb191c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/iotools/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - vapier@gentoo.org - - - Generate sub-command symlinks to iotools -- note that a lot are simple like "xor" - - From 237c094ed1c5afdf76d2f48f248a4b56ec85edd2 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 17:09:36 +0000 Subject: [PATCH 08/22] net-libs/serf: Move back to portage-stable --- .../metadata/md5-cache/net-libs/serf-1.3.8-r1 | 13 - .../coreos-overlay/net-libs/serf/ChangeLog | 544 ------------------ .../coreos-overlay/net-libs/serf/Manifest | 17 - ...e_linking_against_unneeded_libraries.patch | 13 - .../files/serf-1.3.8-scons_variables.patch | 110 ---- .../serf/files/serf-1.3.8-tests.patch | 95 --- .../coreos-overlay/net-libs/serf/metadata.xml | 11 - .../net-libs/serf/serf-1.3.8-r1.ebuild | 65 --- 8 files changed, 868 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/serf-1.3.8-r1 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/serf/ChangeLog delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/serf/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.8-scons_variables.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.8-tests.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/serf/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/serf/serf-1.3.8-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/serf-1.3.8-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/serf-1.3.8-r1 deleted file mode 100644 index 219ad8af9c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/serf-1.3.8-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install prepare test -DEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 ) >=dev-util/scons-2.3.0 dev-util/scons[python_targets_python2_7] -DESCRIPTION=HTTP client library -EAPI=5 -HOMEPAGE=https://code.google.com/p/serf/ -IUSE=kerberos -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos -LICENSE=Apache-2.0 -RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 ) -SLOT=1 -SRC_URI=https://serf.googlecode.com/svn/src_releases/serf-1.3.8.tar.bz2 -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 scons-utils 741000d14c0b59263aac3f3cf6e39909 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=fae1f2240cdfc5d31ebd7daaabccabe2 diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/ChangeLog b/sdk_container/src/third_party/coreos-overlay/net-libs/serf/ChangeLog deleted file mode 100644 index 7a8f9bc9bc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/ChangeLog +++ /dev/null @@ -1,544 +0,0 @@ -# ChangeLog for net-libs/serf -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/ChangeLog,v 1.161 2015/01/13 22:24:24 floppym Exp $ - - 13 Jan 2015; Mike Gilbert - -files/serf-0.3.1-disable-unneeded-linking.patch: - Remove obsolete patch. - - 13 Jan 2015; Mike Gilbert serf-1.3.8.ebuild: - Keyword ~amd64-fbsd, tested by Yutah SATOH on bug 488434. - - 13 Jan 2015; Mike Gilbert -serf-1.2.1.ebuild, - -serf-1.3.2.ebuild, -serf-1.3.3.ebuild, -serf-1.3.4.ebuild, - -serf-1.3.5.ebuild, -serf-1.3.6.ebuild, -serf-1.3.7.ebuild: - Remove old. - - 01 Dec 2014; Agostino Sarubbo serf-1.3.8.ebuild: - Stable for sparc, wrt bug #528326 - - 13 Nov 2014; Tobias Klausmann serf-1.3.8.ebuild: - Stable on alpha, bug 528326 - - 11 Nov 2014; Agostino Sarubbo serf-1.3.8.ebuild: - Stable for ia64, wrt bug #528326 - - 10 Nov 2014; Agostino Sarubbo serf-1.3.8.ebuild: - Stable for ppc64, wrt bug #528326 - - 10 Nov 2014; Agostino Sarubbo serf-1.3.8.ebuild: - Stable for ppc, wrt bug #528326 - - 08 Nov 2014; Agostino Sarubbo serf-1.3.8.ebuild: - Stable for x86, wrt bug #528326 - - 08 Nov 2014; Agostino Sarubbo serf-1.3.8.ebuild: - Stable for amd64, wrt bug #528326 - - 08 Nov 2014; Markus Meier serf-1.3.8.ebuild: - arm stable, bug #528326 - - 05 Nov 2014; Jeroen Roovers serf-1.3.8.ebuild: - Stable for HPPA (bug #528326). - - 05 Nov 2014; Mike Gilbert serf-1.3.8.ebuild: - Update deletion of -O2. Patch by Arfrever. - -*serf-1.3.8 (05 Nov 2014) - - 05 Nov 2014; Mike Gilbert - +files/serf-1.3.8-scons_variables.patch, +files/serf-1.3.8-tests.patch, - +serf-1.3.8.ebuild: - Version bump. Ebuild by Arfrever. Fix RUNPATH (bug #509242). Usage of SSL 2 - and 3 disabled. - - 30 Aug 2014; Agostino Sarubbo serf-1.3.7.ebuild: - Stable for ppc64, wrt bug #519202 - - 21 Aug 2014; Agostino Sarubbo serf-1.3.7.ebuild: - Stable for ppc, wrt bug #519202 - - 20 Aug 2014; Agostino Sarubbo serf-1.3.7.ebuild: - Stable for amd64, wrt bug #519202 - - 20 Aug 2014; Raúl Porcel serf-1.3.7.ebuild: - alpha/arm/arm64/ia64/sparc/x86 stable wrt #519202 - - 19 Aug 2014; Jeroen Roovers serf-1.3.7.ebuild: - Stable for HPPA (bug #519202). - - 14 Aug 2014; Pawel Hajdan jr serf-1.3.6.ebuild: - x86 stable wrt bug #518616 - -*serf-1.3.7 (11 Aug 2014) - - 11 Aug 2014; Mike Gilbert +serf-1.3.7.ebuild: - Version bump. Ebuild by Arfrever. - - 08 Aug 2014; Jeroen Roovers serf-1.3.6.ebuild: - Stable for HPPA (bug #518616). - - 26 Jul 2014; Pawel Hajdan jr serf-1.3.5.ebuild: - x86 stable wrt bug #512454 - - 09 Jul 2014; Chema Alonso serf-1.3.5.ebuild: - Stable for amd64 wrt bug #512454 - - 04 Jul 2014; Michael Haubenwallner serf-1.3.6.ebuild: - add ~ppc-aix keyword - - 22 Jun 2014; Akinori Hattori serf-1.3.5.ebuild: - ia64 stable wrt bug #512454 - - 19 Jun 2014; Markus Meier serf-1.3.5.ebuild: - arm stable, bug #512454 - - 14 Jun 2014; Pawel Hajdan jr serf-1.3.4.ebuild: - x86 stable wrt bug #504220 - -*serf-1.3.6 (10 Jun 2014) - - 10 Jun 2014; Mike Gilbert +serf-1.3.6.ebuild: - Version bump. Ebuild by Arfrever. - - 10 Jun 2014; Mike Frysinger serf-1.3.4.ebuild, - serf-1.3.5.ebuild: - Add arm64/m68k love. - - 10 Jun 2014; Mike Frysinger serf-1.3.4.ebuild: - Mark s390/sh stable. - - 06 Jun 2014; Jeroen Roovers serf-1.3.5.ebuild: - Stable for HPPA (bug #512454). - - 09 May 2014; Michael Haubenwallner serf-1.3.5.ebuild: - add ~x86-linux prefix keyword - -*serf-1.3.5 (30 Apr 2014) - - 30 Apr 2014; Mike Gilbert +serf-1.3.5.ebuild: - Version bump. Ebuild by Arfrever. - - 26 Mar 2014; Markus Meier serf-1.3.4.ebuild: - arm stable, bug #504220 - - 26 Mar 2014; Chema Alonso serf-1.3.4.ebuild: - Stable for amd64 wrt bug #504220 - - 19 Mar 2014; Agostino Sarubbo serf-1.3.3.ebuild: - Stable for alpha, wrt bug #498868 - - 16 Mar 2014; Jeroen Roovers serf-1.3.4.ebuild: - Stable for HPPA (bug #504220). - - 14 Mar 2014; Agostino Sarubbo serf-1.3.3.ebuild: - Stable for ppc64, wrt bug #498868 - - 22 Feb 2014; Markus Meier serf-1.3.3.ebuild: - arm stable, bug #498868 - -*serf-1.3.4 (09 Feb 2014) - - 09 Feb 2014; Mike Gilbert +serf-1.3.4.ebuild: - Version bump. Ebuild by Arfrever. - - 02 Feb 2014; Agostino Sarubbo serf-1.3.3.ebuild: - Stable for ppc, wrt bug #498868 - - 27 Jan 2014; Akinori Hattori serf-1.3.3.ebuild: - ia64 stable wrt bug #498868 - - 26 Jan 2014; Agostino Sarubbo serf-1.3.3.ebuild: - Stable for sparc, wrt bug #498868 - - 26 Jan 2014; Agostino Sarubbo serf-1.3.3.ebuild: - Stable for x86, wrt bug #498868 - - 23 Jan 2014; Chema Alonso serf-1.3.3.ebuild: - Stable for amd64 wrt bug #498868 - - 22 Jan 2014; Jeroen Roovers serf-1.3.3.ebuild: - Stable for HPPA (bug #498868). - - 18 Jan 2014; Mike Frysinger serf-1.2.1.ebuild: - Mark s390/sh stable. - - 16 Jan 2014; Fabian Groffen serf-1.2.1.ebuild: - Marked (non-scons version) ~*-solaris - - 07 Jan 2014; Christoph Junghans serf-1.3.3.ebuild: - added some prefix keywords (tested by me) - -*serf-1.3.3 (20 Dec 2013) - - 20 Dec 2013; Mike Gilbert +serf-1.3.3.ebuild: - Version bump. Ebuild by Arfrever. - - 19 Oct 2013; Mike Gilbert serf-1.3.2.ebuild: - Restore s390 and sh keywords. - -*serf-1.3.2 (17 Oct 2013) - - 17 Oct 2013; Mike Gilbert - +files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch, - +serf-1.3.2.ebuild: - Version bump. Ebuild and patch by Arfrever. - - 17 Oct 2013; Mike Gilbert -serf-0.7.2.ebuild, - -serf-1.1.1.ebuild, -serf-1.2.0.ebuild: - Remove per Arfrever. - - 06 Sep 2013; Agostino Sarubbo serf-1.2.1.ebuild: - Stable for sparc, wrt bug #479586 - - 18 Aug 2013; Agostino Sarubbo serf-1.2.1.ebuild: - Stable for x86, wrt bug #479586 - - 13 Aug 2013; Agostino Sarubbo serf-1.2.1.ebuild: - Stable for alpha, wrt bug #479586 - - 10 Aug 2013; Agostino Sarubbo serf-1.2.1.ebuild: - Stable for ppc, wrt bug #479586 - - 07 Aug 2013; Sergey Popov serf-1.2.1.ebuild: - Stable on arm, wrt bug #479586 - - 06 Aug 2013; Jeroen Roovers serf-1.2.1.ebuild: - Stable for HPPA (bug #479586). - - 04 Aug 2013; Agostino Sarubbo serf-1.2.1.ebuild: - Stable for ppc64, wrt bug #479586 - - 04 Aug 2013; Agostino Sarubbo serf-1.2.1.ebuild: - Stable for ia64, wrt bug #479586 - - 03 Aug 2013; Agostino Sarubbo serf-1.2.1.ebuild: - Stable for amd64, wrt bug #479586 - -*serf-1.2.1 (03 Jun 2013) - - 03 Jun 2013; Mike Gilbert +serf-1.2.1.ebuild: - Version bump. Ebuild by Arfrever. - - 20 May 2013; Agostino Sarubbo serf-1.2.0.ebuild: - Stable for s390, wrt bug #468220 - - 14 May 2013; Agostino Sarubbo serf-1.2.0.ebuild: - Stable for x86, wrt bug #468220 - - 08 May 2013; Agostino Sarubbo serf-1.2.0.ebuild: - Stable for sh, wrt bug #468220 - - 07 May 2013; Agostino Sarubbo serf-1.2.0.ebuild: - Stable for ppc64, wrt bug #468220 - - 07 May 2013; Agostino Sarubbo serf-1.2.0.ebuild: - Stable for sparc, wrt bug #468220 - - 07 May 2013; Agostino Sarubbo serf-1.2.0.ebuild: - Stable for ia64, wrt bug #468220 - - 05 May 2013; Agostino Sarubbo serf-1.2.0.ebuild: - Stable for alpha, wrt bug #468220 - - 05 May 2013; Agostino Sarubbo serf-1.2.0.ebuild: - Stable for arm, wrt bug #468220 - - 03 May 2013; Jeroen Roovers serf-1.2.0.ebuild: - Stable for HPPA (bug #468220). - - 03 May 2013; Agostino Sarubbo serf-1.2.0.ebuild: - Stable for ppc, wrt bug #468220 - - 02 May 2013; Agostino Sarubbo serf-1.2.0.ebuild: - Stable for amd64, wrt bug #468220 - - 02 May 2013; Mike Gilbert -serf-1.0.0.ebuild, - -serf-1.0.1.ebuild, -serf-1.0.3.ebuild, -serf-1.1.0.ebuild: - Remove old per Arferver. - -*serf-1.2.0 (23 Feb 2013) - - 23 Feb 2013; Mike Gilbert +serf-1.2.0.ebuild: - Version bump. Ebuild by Arfrever. - - 01 Jan 2013; Raúl Porcel serf-1.1.1.ebuild: - s390/sh stable wrt #446524 - - 30 Dec 2012; Agostino Sarubbo serf-1.1.1.ebuild: - Stable for alpha, wrt bug #446524 - - 29 Dec 2012; Agostino Sarubbo serf-1.1.1.ebuild: - Stable for sparc, wrt bug #446524 - - 19 Dec 2012; Jeroen Roovers serf-1.1.1.ebuild: - Stable for HPPA (bug #446524). - - 18 Dec 2012; Agostino Sarubbo serf-1.1.1.ebuild: - Stable for ia64, wrt bug #446524 - - 12 Dec 2012; Anthony G. Basile serf-1.1.1.ebuild: - stable arm ppc, bug #446524 - - 12 Dec 2012; Agostino Sarubbo serf-1.1.1.ebuild: - Stable for x86, wrt bug #446524 - - 11 Dec 2012; Agostino Sarubbo serf-1.1.1.ebuild: - Stable for amd64, wrt bug #446524 - - 10 Dec 2012; Sergey Popov serf-1.1.1.ebuild: - Add static-libs USE flag, wrt bug #446722 - - 10 Dec 2012; Agostino Sarubbo serf-1.1.1.ebuild: - Stable for ppc64, wrt bug #446524 - -*serf-1.1.1 (06 Oct 2012) - - 06 Oct 2012; Mike Gilbert +serf-1.1.1.ebuild: - Version bump. Ebuild by Arfrever. - - 02 Sep 2012; Raúl Porcel serf-1.1.0.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #428076 - - 04 Aug 2012; Agostino Sarubbo serf-1.1.0.ebuild: - Stable for amd64, wrt bug #428076 - - 30 Jul 2012; Anthony G. Basile serf-1.1.0.ebuild: - Stable arm, bug #428076 - - 29 Jul 2012; Anthony G. Basile serf-1.1.0.ebuild: - Stable ppc ppc64, bug #428076 - - 27 Jul 2012; Jeroen Roovers serf-1.1.0.ebuild: - Stable for HPPA (bug #428076). - - 25 Jul 2012; Jeff Horelick serf-1.1.0.ebuild: - marked x86 per bug 428076 - -*serf-1.1.0 (11 Jun 2012) - - 11 Jun 2012; Mike Gilbert +serf-1.1.0.ebuild: - Version bump. Ebuild by Arfrever. - - 12 May 2012; Alexis Ballier serf-1.0.3.ebuild: - keyword ~amd64-fbsd - -*serf-1.0.3 (24 Mar 2012) - - 24 Mar 2012; Markos Chandras +serf-1.0.3.ebuild: - Version bump - -*serf-1.0.1 (13 Mar 2012) - - 13 Mar 2012; Mike Gilbert +serf-1.0.1.ebuild: - Version bump. Ebuild by Arfrever. - -*serf-1.0.0 (24 Oct 2011) - - 24 Oct 2011; Markos Chandras +serf-1.0.0.ebuild: - Version bump. Ebuild by Arfrever - - 18 Sep 2011; Pacho Ramos metadata.xml: - Add Arfrever as proxy maintainer with proxy-maintainers as herd. - - 13 Sep 2011; Pacho Ramos metadata.xml: - Drop maintainer due retirement, bug #246793 - - 05 Aug 2011; Markos Chandras -serf-0.7.0.ebuild, - -serf-0.7.1.ebuild: - Remove old ebuild. Requested by Arfrever - - 17 Jul 2011; Kacper Kowalik serf-0.7.2.ebuild: - ppc64 stable wrt #364417 - - 29 May 2011; Raúl Porcel serf-0.7.2.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #364417 - - 24 May 2011; Brent Baude serf-0.7.2.ebuild: - Marking serf-0.7.2 ppc for bug 364417 - - 22 May 2011; Thomas Kahle serf-0.7.2.ebuild: - x86 stable per bug 364417 - - 15 May 2011; Markus Meier serf-0.7.2.ebuild: - arm stable, bug #364417 - - 26 Apr 2011; Jeroen Roovers serf-0.7.2.ebuild: - Stable for HPPA (bug #364417). - - 26 Apr 2011; Markos Chandras serf-0.7.2.ebuild: - Stable on amd64 wrt bug #364417 - - 24 Apr 2011; Fabian Groffen serf-0.7.2.ebuild: - Marked ~ppc-macos and ~x64-macos, bug #293901 - - 25 Mar 2011; Kacper Kowalik serf-0.7.1.ebuild: - ppc/ppc64 stable wrt #357277 - -*serf-0.7.2 (23 Mar 2011) - - 23 Mar 2011; Arfrever Frehtes Taifersar Arahesis - +serf-0.7.2.ebuild: - Version bump. - - 20 Mar 2011; Raúl Porcel serf-0.7.1.ebuild: - ia64/s390/sh/sparc stable wrt #357277 - - 14 Mar 2011; Markus Meier serf-0.7.1.ebuild: - arm stable, bug #357277 - - 12 Mar 2011; Tobias Klausmann serf-0.7.1.ebuild: - Stable on alpha, bug #357277 - - 08 Mar 2011; Jeroen Roovers serf-0.7.1.ebuild: - Stable for HPPA (bug #357277). - - 06 Mar 2011; Christian Faulhammer serf-0.7.1.ebuild: - stable x86, bug 357277 - - 04 Mar 2011; Markos Chandras serf-0.7.1.ebuild: - Stable on amd64 wrt bug #357277 - -*serf-0.7.1 (28 Jan 2011) - - 28 Jan 2011; Arfrever Frehtes Taifersar Arahesis - +serf-0.7.1.ebuild: - Version bump. - - 27 Dec 2010; Arfrever Frehtes Taifersar Arahesis - -serf-0.3.1.ebuild: - Delete. - - 27 Dec 2010; Brent Baude serf-0.7.0.ebuild: - stable ppc64, bug 343757 - - 13 Dec 2010; Brent Baude serf-0.7.0.ebuild: - stable ppc, bug 343757 - - 06 Dec 2010; Raúl Porcel serf-0.7.0.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #343757 - - 26 Nov 2010; Jeroen Roovers serf-0.7.0.ebuild: - Stable for HPPA (bug #343757). - - 06 Nov 2010; Markus Meier serf-0.7.0.ebuild: - arm stable, bug #343757 - - 05 Nov 2010; Dane Smith serf-0.7.0.ebuild: - Stable x86 wrt bug 343757. - - 03 Nov 2010; Markos Chandras serf-0.7.0.ebuild: - Stable on amd64 wrt bug #343757 - -*serf-0.7.0 (01 Oct 2010) - - 01 Oct 2010; Arfrever Frehtes Taifersar Arahesis - -serf-0.3.0.ebuild, -files/serf-0.3.0-disable-unneeded-linking.patch, - +serf-0.7.0.ebuild: - Version bump. - - 30 Sep 2010; Brent Baude serf-0.3.1.ebuild: - stable ppc64, bug 325423 - - 10 Sep 2010; Arfrever Frehtes Taifersar Arahesis - metadata.xml: - Restore previous maintainer. - - 19 Aug 2010; Jeroen Roovers metadata.xml: - Remove arfrever. - - 14 Jul 2010; Jeroen Roovers serf-0.3.1.ebuild: - Stable for HPPA (bug #325423). - - 11 Jul 2010; Raúl Porcel serf-0.3.1.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #325423 - - 28 Jun 2010; Christian Faulhammer serf-0.3.1.ebuild: - stable x86, bug 325423 - - 27 Jun 2010; serf-0.3.1.ebuild: - ppc stable #325423 - - 26 Jun 2010; Christoph Mende serf-0.3.1.ebuild: - Stable on amd64 wrt bug #325423 - -*serf-0.3.1 (26 May 2010) - - 26 May 2010; Arfrever Frehtes Taifersar Arahesis - +serf-0.3.1.ebuild, +files/serf-0.3.1-disable-unneeded-linking.patch: - Version bump (bug #305859). - - 28 Apr 2009; Raúl Porcel serf-0.3.0.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #267269 - - 27 Apr 2009; Markus Meier serf-0.3.0.ebuild: - amd64/x86 stable, bug #267269 - - 24 Apr 2009; Brent Baude serf-0.3.0.ebuild: - stable ppc, bug 267269 - - 24 Apr 2009; Brent Baude serf-0.3.0.ebuild: - stable ppc64, bug 267269 - - 24 Apr 2009; Jeroen Roovers serf-0.3.0: - Stable for HPPA (bug #267269). - -*serf-0.3.0 (21 Mar 2009) - - 21 Mar 2009; Arfrever Frehtes Taifersar Arahesis - +files/serf-0.3.0-disable-unneeded-linking.patch, +serf-0.3.0.ebuild: - Version bump (bug #260631). - - 12 Nov 2008; Peter Volkov serf-0.2.0.ebuild: - Added ~mips, bug #212056. - - 04 Nov 2008; Mike Frysinger serf-0.2.0.ebuild: - Add arm/s390/sh love. - - 08 Sep 2008; Guy Martin serf-0.2.0.ebuild: - hppa stable, #236130 - - 31 Aug 2008; Raúl Porcel serf-0.2.0.ebuild: - alpha/ia64/sparc stable wrt #236130 - - 31 Aug 2008; Brent Baude serf-0.2.0.ebuild: - stable ppc64, bug 236130 - - 30 Aug 2008; Brent Baude serf-0.2.0.ebuild: - stable ppc, bug 236130 - - 29 Aug 2008; Markus Meier serf-0.2.0.ebuild: - amd64/x86 stable, bug #236130 - -*serf-0.2.0 (01 Jul 2008) - - 01 Jul 2008; Benedikt Böhm +serf-0.2.0.ebuild: - version bump wrt #229367 - - 14 Jun 2008; nixnut serf-0.1.2.ebuild: - Added ~ppc - - 07 Jun 2008; Alexis Ballier serf-0.1.2.ebuild: - keyword ~sparc-fbsd - - 07 Jun 2008; Alexis Ballier serf-0.1.2.ebuild: - keyword ~x86-fbsd - - 17 May 2008; Jeroen Roovers serf-0.1.2.ebuild: - Marked ~hppa (bug #219882). - - 12 May 2008; Raúl Porcel serf-0.1.2.ebuild: - Add ~alpha/~ia64 wrt #219882 - - 11 May 2008; Markus Rothe serf-0.1.2.ebuild: - Added ~ppc64; bug #219882 - - 02 May 2008; Ferris McCormick serf-0.1.2.ebuild: - Add ~sparc, part of Bug #219882. Test suite runs as expected. - -*serf-0.1.2 (30 Apr 2008) - - 30 Apr 2008; Benedikt Böhm - +files/0.1.2-disable-unneeded-linking.patch, +metadata.xml, - +serf-0.1.2.ebuild: - initial ebuild, bug #219391 diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/Manifest b/sdk_container/src/third_party/coreos-overlay/net-libs/serf/Manifest deleted file mode 100644 index 8cf3a24f41..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/Manifest +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX serf-1.3.2-disable_linking_against_unneeded_libraries.patch 554 SHA256 057212a8d404c5f6947b816c72e14a340cf8bb62d1023b9b2459220e9aa5d9f6 SHA512 29a2a18d062ecede2c544a6de510f17556deb9d9036b4c9248035e22d561e90fac902fdd38c5dbda649bb44f2eeab3407ee3fc59697c825a8fd76a787043c4ee WHIRLPOOL 11964600ababa183ce2a00bc031d833a8ffd73685f48a281078e4628f75c52aa160cd3bbaeba3f39a8c2ca4b93fab56fd88eec00c6bce785da1601587dd413f3 -AUX serf-1.3.8-scons_variables.patch 3553 SHA256 e4c19508eef345eddebdaf932c40279d835adcce9eb4988dd9fc7b1318cf554d SHA512 e492c5a9289700330e964a9b42da9002f1b992ed197a9aea54f188188264e8dc2047a3005c9724769ff5e845d5b9db31d622981e016284523fc65dec6a3c04bf WHIRLPOOL 0fa539b1c3dba179753348422add7b5a3b5d0ce6e914ef2bb7cc0079ccde7bf7183c80212ea5dfb33706669011c08b2700fc8b97adad0923e93e1d6f6bad00be -AUX serf-1.3.8-tests.patch 3159 SHA256 273f91ccf80f607bd8bd5e0fbe2fc4ad617510a032d65d64ad1a2aabeba127d5 SHA512 d2b89743e38492a0626b509864c34a3747d73b5aeb7a22df84ce739588663582eea3b6c3d599b8e42896b1720c529e19c5497ff4e830e67981f0664b5e6c533d WHIRLPOOL 64e61a39343a9ab5770991e047cca282fd20f0e346eb295d1feae6eaa433cb8def390adc2ffb9b2cc9fa38eeb313a164314abc219ed94afe1b6a7ba46b23b64f -DIST serf-1.3.8.tar.bz2 143337 SHA256 e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205 WHIRLPOOL 951b1ff92e739998f24bd44e2541c10352c83594cbfdb82ba915ced32509df7d6f2bbec8bd8fbf4c75116dab114970d1a8ec2fc0157912303bfbd065ea6739ac -EBUILD serf-1.3.8.ebuild 1605 SHA256 09114d78bde0cbf42ef9222ff56e9c36cad54f62d9643952ae789b30ce28bec2 SHA512 5cdca0d7f6c5309fd86c5a9753e922e2d1a2a7de7f15bfc888ebb9defc321b21b81f5fdec50a2fddc5ac6e50d959453b7c613cd1fc411d710fa3d142b8a62ded WHIRLPOOL 12f096113f51704f3019bc947feef10de8683a12947cbb0d381be2d36e35fe2bc645ffe3205c396db273f999636fe7a00548b7ff097e735010f1ce4181398062 -MISC ChangeLog 17897 SHA256 ba82cdad5ad4b2d3185bb3f9b742f6c4e6f17cef4ac5dd77f0767f6865eb7346 SHA512 60d9777e05a961fa1600647c82bc0ee58e4b85fb2eeeb23196af1fac4484c0085fafd76acd78bcb6c109878d233f8a14d151b2d16566f7943010d7b2ef2bd6eb WHIRLPOOL 0059e21507d152b5b3a1c24f76780e72c9422060d05a92ede6acf3d94fe0f58d94d8fdf5fa0943a9778715249f3886b01d135c60373bca26e549270373773eee -MISC metadata.xml 314 SHA256 8c4f67c5ad4fce7c5eadc49ad4914bdf167df690c4475af52955c85557654883 SHA512 c20509634f287dcc7657b9cce28797e2fd5ca7a31f253eb9d7720bb90a51ac5f9fee94581edc4f0316730e9f4d7b8f32db792bcbd541248bc6c6d0db52093445 WHIRLPOOL 6d114fd80428a8e04002a513a09df4b8428c2fbd9cd0a1b83b9e05e813d964124e635a74fefdf844567860182107e7067a06a1549bee84eec219f4e205f4c3a7 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iF4EAREIAAYFAlS1mxkACgkQC77qH+pIQ6QgegD/XkM6SVx5Z3eHVjB+sM8+FKi/ -bG57L6Wz985ppawjpYEA/08Ibx/ucI5LtBn5pVgMHNj7UMdBAUq5B4umzFw+O3ik -=thVF ------END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch deleted file mode 100644 index f86646a28d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- SConstruct -+++ SConstruct -@@ -345,8 +345,8 @@ - ### there is probably a better way to run/capture output. - ### env.ParseConfig() may be handy for getting this stuff into the build - if CALLOUT_OKAY: -- apr_libs = os.popen(env.subst('$APR --link-libtool --libs')).read().strip() -- apu_libs = os.popen(env.subst('$APU --link-libtool --libs')).read().strip() -+ apr_libs = os.popen(env.subst('$APR --link-ld')).read().strip() -+ apu_libs = os.popen(env.subst('$APU --link-ld')).read().strip() - else: - apr_libs = '' - apu_libs = '' diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.8-scons_variables.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.8-scons_variables.patch deleted file mode 100644 index b51e846d89..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.8-scons_variables.patch +++ /dev/null @@ -1,110 +0,0 @@ -https://code.google.com/p/serf/issues/detail?id=151 -https://code.google.com/p/serf/source/detail?r=2413 - ---- SConstruct -+++ SConstruct -@@ -223,12 +223,12 @@ - - if sys.platform == 'darwin': - # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) -- env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)) -+ env.Append(LINKFLAGS=['-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)]) - - if sys.platform != 'win32': - ### gcc only. figure out appropriate test / better way to check these - ### flags, and check for gcc. -- env.Append(CFLAGS='-std=c89') -+ env.Append(CFLAGS=['-std=c89']) - - ### These warnings are not available on Solaris - if sys.platform != 'sunos5': -@@ -237,17 +237,17 @@ - '-Wall']) - - if debug: -- env.Append(CCFLAGS='-g') -+ env.Append(CCFLAGS=['-g']) - env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) - else: -- env.Append(CCFLAGS='-O2') -- env.Append(CPPDEFINES='NDEBUG') -+ env.Append(CCFLAGS=['-O2']) -+ env.Append(CPPDEFINES=['NDEBUG']) - - ### works for Mac OS. probably needs to change - env.Append(LIBS=['ssl', 'crypto', 'z', ]) - - if sys.platform == 'sunos5': -- env.Append(LIBS='m') -+ env.Append(LIBS=['m']) - else: - # Warning level 4, no unused argument warnings - env.Append(CCFLAGS=['/W4', '/wd4100']) -@@ -260,8 +260,8 @@ - else: - # Optimize for speed, use DLL runtime - env.Append(CCFLAGS=['/O2', '/MD']) -- env.Append(CPPDEFINES='NDEBUG') -- env.Append(LINKFLAGS='/RELEASE') -+ env.Append(CPPDEFINES=['NDEBUG']) -+ env.Append(LINKFLAGS=['/RELEASE']) - - # PLAN THE BUILD - SHARED_SOURCES = [] -@@ -307,25 +307,25 @@ - CPPPATH=['$APR/include', '$APU/include']) - - # zlib -- env.Append(LIBS='zlib.lib') -+ env.Append(LIBS=['zlib.lib']) - if not env.get('SOURCE_LAYOUT', None): -- env.Append(CPPPATH='$ZLIB/include', -- LIBPATH='$ZLIB/lib') -+ env.Append(CPPPATH=['$ZLIB/include'], -+ LIBPATH=['$ZLIB/lib']) - else: -- env.Append(CPPPATH='$ZLIB', -- LIBPATH='$ZLIB') -+ env.Append(CPPPATH=['$ZLIB'], -+ LIBPATH=['$ZLIB']) - - # openssl - env.Append(LIBS=['libeay32.lib', 'ssleay32.lib']) - if not env.get('SOURCE_LAYOUT', None): -- env.Append(CPPPATH='$OPENSSL/include/openssl', -- LIBPATH='$OPENSSL/lib') -+ env.Append(CPPPATH=['$OPENSSL/include/openssl'], -+ LIBPATH=['$OPENSSL/lib']) - elif 0: # opensslstatic: -- env.Append(CPPPATH='$OPENSSL/inc32', -- LIBPATH='$OPENSSL/out32') -+ env.Append(CPPPATH=['$OPENSSL/inc32'], -+ LIBPATH=['$OPENSSL/out32']) - else: -- env.Append(CPPPATH='$OPENSSL/inc32', -- LIBPATH='$OPENSSL/out32dll') -+ env.Append(CPPPATH=['$OPENSSL/inc32'], -+ LIBPATH=['$OPENSSL/out32dll']) - else: - if os.path.isdir(apr): - apr = os.path.join(apr, 'bin', 'apr-1-config') -@@ -351,8 +351,8 @@ - apr_libs = '' - apu_libs = '' - -- env.Append(CPPPATH='$OPENSSL/include') -- env.Append(LIBPATH='$OPENSSL/lib') -+ env.Append(CPPPATH=['$OPENSSL/include']) -+ env.Append(LIBPATH=['$OPENSSL/lib']) - - - # If build with gssapi, get its information and define SERF_HAVE_GSSAPI -@@ -362,7 +362,7 @@ - env['GSSAPI_LIBS'] = cmd.strip() - return env.MergeFlags(cmd, unique) - env.ParseConfig('$GSSAPI --libs gssapi', parse_libs) -- env.Append(CPPDEFINES='SERF_HAVE_GSSAPI') -+ env.Append(CPPDEFINES=['SERF_HAVE_GSSAPI']) - if sys.platform == 'win32': - env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) - diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.8-tests.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.8-tests.patch deleted file mode 100644 index 65b9962f25..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/files/serf-1.3.8-tests.patch +++ /dev/null @@ -1,95 +0,0 @@ -https://code.google.com/p/serf/source/detail?r=2443 -https://code.google.com/p/serf/source/detail?r=2444 -https://code.google.com/p/serf/source/detail?r=2445 - ---- test/test_buckets.c -+++ test/test_buckets.c -@@ -1232,9 +1232,9 @@ - - /* The largest buffer we should need is 0.1% larger than the - uncompressed data, + 12 bytes. This info comes from zlib.h. -+ buf_size = orig_len + (orig_len / 1000) + 12; - Note: This isn't sufficient when using Z_NO_FLUSH and extremely compressed - data. Use a buffer bigger than what we need. */ --// buf_size = orig_len + (orig_len / 1000) + 12; - buf_size = 100000; - - write_buf = apr_palloc(pool, buf_size); -@@ -1309,12 +1309,12 @@ - expected_len); - } - --static void deflate_buckets(CuTest *tc, int nr_of_loops) -+static void deflate_buckets(CuTest *tc, int nr_of_loops, apr_pool_t *pool) - { - const char *msg = "12345678901234567890123456789012345678901234567890"; - - test_baton_t *tb = tc->testBaton; -- serf_bucket_alloc_t *alloc = serf_bucket_allocator_create(tb->pool, NULL, -+ serf_bucket_alloc_t *alloc = serf_bucket_allocator_create(pool, NULL, - NULL); - z_stream zdestr; - int i; -@@ -1333,8 +1333,8 @@ - { - serf_config_t *config; - -- serf_context_t *ctx = serf_context_create(tb->pool); -- /* status = */ serf__config_store_get_config(ctx, NULL, &config, tb->pool); -+ serf_context_t *ctx = serf_context_create(pool); -+ /* status = */ serf__config_store_get_config(ctx, NULL, &config, pool); - - serf_bucket_set_config(defbkt, config); - } -@@ -1356,11 +1356,11 @@ - if (i == nr_of_loops - 1) { - CuAssertIntEquals(tc, APR_SUCCESS, - deflate_compress(&data, &len, &zdestr, msg, -- strlen(msg), 1, tb->pool)); -+ strlen(msg), 1, pool)); - } else { - CuAssertIntEquals(tc, APR_SUCCESS, - deflate_compress(&data, &len, &zdestr, msg, -- strlen(msg), 0, tb->pool)); -+ strlen(msg), 0, pool)); - } - - if (len == 0) -@@ -1378,10 +1378,15 @@ - static void test_deflate_buckets(CuTest *tc) - { - int i; -+ apr_pool_t *iterpool; -+ test_baton_t *tb = tc->testBaton; - -+ apr_pool_create(&iterpool, tb->pool); - for (i = 1; i < 1000; i++) { -- deflate_buckets(tc, i); -+ apr_pool_clear(iterpool); -+ deflate_buckets(tc, i, iterpool); - } -+ apr_pool_destroy(iterpool); - } - - static apr_status_t discard_data(serf_bucket_t *bkt, ---- test/test_util.c -+++ test/test_util.c -@@ -363,10 +363,18 @@ - return status; - } - -+static int pool_abort_func(int retcode) -+{ -+ fprintf(stderr, "Out of memory\n"); -+ abort(); -+ return 0; -+} -+ - void *test_setup(void *dummy) - { - apr_pool_t *test_pool; - apr_pool_create(&test_pool, NULL); -+ apr_pool_abort_set(pool_abort_func, test_pool); - return test_pool; - } - diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-libs/serf/metadata.xml deleted file mode 100644 index d5a616789e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - proxy-maintainers - - arfrever.fta@gmail.com - - - serf - - diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/serf-1.3.8-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/serf/serf-1.3.8-r1.ebuild deleted file mode 100644 index bbedf91773..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/serf-1.3.8-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/serf-1.3.8.ebuild,v 1.12 2015/01/13 22:01:06 floppym Exp $ - -EAPI="5" - -inherit eutils scons-utils toolchain-funcs - -DESCRIPTION="HTTP client library" -HOMEPAGE="https://code.google.com/p/serf/" -SRC_URI="https://serf.googlecode.com/svn/src_releases/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="kerberos" - -RDEPEND="dev-libs/apr:1= - dev-libs/apr-util:1= - dev-libs/openssl:0= - sys-libs/zlib:0= - kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - >=dev-util/scons-2.3.0" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch" - epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch" - epatch "${FILESDIR}/${PN}-1.3.8-tests.patch" - - # https://code.google.com/p/serf/issues/detail?id=133 - sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct - - # Accept C++ comments in system headers. - # Fixes error: expected identifier or '(' before '/' token - sed -e "s/-std=c89//" -i SConstruct -} - -src_compile() { - local myesconsargs=( - PREFIX="${EPREFIX}/usr" - LIBDIR="${EPREFIX}/usr/$(get_libdir)" - APR="${EROOT}usr/bin/apr-1-config" - APU="${EROOT}usr/bin/apu-1-config" - OPENSSL="${EROOT}usr" - CC="$(tc-getCC)" - CPPFLAGS="${CPPFLAGS}" - CFLAGS="${CFLAGS}" - LINKFLAGS="${LDFLAGS} --sysroot=${SYSROOT}" - ) - - if use kerberos; then - myesconsargs+=(GSSAPI="${EPREFIX}/usr/bin/krb5-config") - fi - - escons -} - -src_test() { - escons check -} - -src_install() { - escons install --install-sandbox="${D}" -} From 598a55b14f340b09347b44108db636fe3c14c9f0 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 18:03:33 +0000 Subject: [PATCH 09/22] dev-lang/spidermonkey: Move back to portage-stable --- .../dev-lang/spidermonkey/Manifest | 1 - ...dermonkey-1.8.5-arm_respect_cflags-3.patch | 99 ----- .../spidermonkey-1.8.5-fix-arm64-va-48.patch | 120 ------ ...dermonkey-1.8.5-fix-install-symlinks.patch | 15 - .../files/spidermonkey-1.8.5-fix-ppc64.patch | 61 --- .../files/spidermonkey-1.8.5-gcc6.patch | 144 ------- .../files/spidermonkey-1.8.5-ia64-fix.patch | 53 --- ...idermonkey-1.8.5-ia64-static-strings.patch | 381 ------------------ .../files/spidermonkey-1.8.5-isfinite.patch | 11 - .../spidermonkey-1.8.5-no-link-lib-deps.patch | 32 -- .../spidermonkey-1.8.5-perf_event-check.patch | 21 - .../spidermonkey-1.8.5-symbol-versions.patch | 32 -- .../spidermonkey-1.8.7-freebsd-pthreads.patch | 11 - ...pidermonkey-perl-defined-array-check.patch | 11 - .../dev-lang/spidermonkey/metadata.xml | 14 - .../spidermonkey/spidermonkey-1.8.5-r6.ebuild | 137 ------- .../md5-cache/dev-lang/spidermonkey-1.8.5-r6 | 13 - 17 files changed, 1156 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-gcc6.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-fix.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-static-strings.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-isfinite.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-no-link-lib-deps.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/Manifest deleted file mode 100644 index 879f69674f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST js185-1.0.0.tar.gz 6164605 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718 WHIRLPOOL 58b372713275874d3ae3c6b58c12c56bf8d17d024d591e321538bcdd8e615332e41655954368ce86b90e970209e3fd650c39d931000880f5ec22cb044b5d7a4e diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch deleted file mode 100644 index ed497ceebb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- a/js-1.8.5/js/src/configure.in 2011-03-31 15:08:36.000000000 -0400 -+++ b/js-1.8.5/js/src/configure.in 2012-11-02 15:32:38.000000000 -0400 -@@ -3550,7 +3550,7 @@ - _SAVE_CFLAGS="$CFLAGS" - if test "$GNU_CC"; then - # gcc needs -mfpu=neon to recognize NEON instructions -- CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp" -+ CFLAGS="$CFLAGS -mfpu=neon" - fi - AC_TRY_COMPILE([], - [asm("vadd.i8 d0, d0, d0");], -@@ -4654,12 +4654,6 @@ - dnl ======================================================== - MOZ_ARG_HEADER(Individual module options) - --dnl Setup default CPU arch for arm target --case "$target_cpu" in -- arm*) -- MOZ_ARM_ARCH=armv7 -- ;; --esac - dnl ======================================================== - dnl = Enable building the Thumb2 instruction set - dnl ======================================================== -@@ -4668,66 +4662,32 @@ - MOZ_THUMB2=1, - MOZ_THUMB2=) - if test -n "$MOZ_THUMB2"; then -- MOZ_ARM_ARCH=armv7 -+ AC_MSG_WARN([thumb2 enabled instead of autodetected -- hope you know what you are doing]) -+else -+ AC_MSG_CHECKING([whether to build for thumb2]) -+ AC_TRY_COMPILE([],[return sizeof(__thumb2__);], -+ [MOZ_THUMB2=1 -+ AC_MSG_RESULT([yes])], -+ [MOZ_THUMB2= -+ AC_MSG_RESULT([no])]) - fi - - dnl ======================================================== - dnl = Enable building for ARM specific CPU features - dnl ======================================================== --MOZ_ARG_WITH_STRING(cpu-arch, --[ --with-cpu-arch=arch Use specific arm architecture CPU features, default armv7], -- MOZ_ARM_ARCH=$withval) -- - if test -n "$MOZ_THUMB2"; then - case "$target_cpu" in - arm*) -- if test "$MOZ_ARM_ARCH" != "armv7"; then -- AC_MSG_ERROR([--enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH]) -- fi - if test "$GNU_CC"; then - AC_DEFINE(MOZ_THUMB2) -- AC_DEFINE(MOZ_ARM_ARCH) -- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" -- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" -- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - else - AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains]) - fi - ;; -- *) -- AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures]) -- ;; -- esac --elif test "$MOZ_ARM_ARCH" = "armv7"; then -- case "$target_cpu" in -- arm*) -- if test "$GNU_CC"; then -- AC_DEFINE(MOZ_ARM_ARCH) -- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" -- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" -- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" -- else -- AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains]) -- fi -- ;; -- *) -- AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures]) -- ;; -- esac --else -- case "$target_cpu" in -- arm*) -- if test "$GNU_CC"; then -- CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float" -- CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float" -- ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float" -- fi -- ;; - esac - fi - - AC_SUBST(MOZ_THUMB2) --AC_SUBST(MOZ_ARM_ARCH) - - dnl ======================================================== - dnl = diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch deleted file mode 100644 index 5733ddf046..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -urN js.orig/src/jsval.h js/src/jsval.h ---- js.orig/src/jsval.h 2016-04-08 08:44:39.417713832 +0000 -+++ js/src/jsval.h 2016-04-11 06:26:40.807919594 +0000 -@@ -66,7 +66,7 @@ - #endif - - #if JS_BITS_PER_WORD == 64 --# define JSVAL_TAG_SHIFT 47 -+# define JSVAL_TAG_SHIFT 48 - #endif - - /* -@@ -135,7 +135,8 @@ - /* Remember to propagate changes to the C defines below. */ - JS_ENUM_HEADER(JSValueTag, uint32) - { -- JSVAL_TAG_MAX_DOUBLE = 0x1FFF0, -+ JSVAL_TAG_DUMMY = 0xFFFFFFFF, /* Make sure the enums cannot fit 16-bits. */ -+ JSVAL_TAG_MAX_DOUBLE = 0xFFF8, - JSVAL_TAG_INT32 = JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_INT32, - JSVAL_TAG_UNDEFINED = JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_UNDEFINED, - JSVAL_TAG_STRING = JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_STRING, -@@ -196,7 +197,7 @@ - #elif JS_BITS_PER_WORD == 64 - - typedef uint32 JSValueTag; --#define JSVAL_TAG_MAX_DOUBLE ((uint32)(0x1FFF0)) -+#define JSVAL_TAG_MAX_DOUBLE ((uint32)(0xFFF8)) - #define JSVAL_TAG_INT32 (uint32)(JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_INT32) - #define JSVAL_TAG_UNDEFINED (uint32)(JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_UNDEFINED) - #define JSVAL_TAG_STRING (uint32)(JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_STRING) -@@ -236,8 +237,8 @@ - - #elif JS_BITS_PER_WORD == 64 - --#define JSVAL_PAYLOAD_MASK 0x00007FFFFFFFFFFFLL --#define JSVAL_TAG_MASK 0xFFFF800000000000LL -+#define JSVAL_PAYLOAD_MASK 0x0000FFFFFFFFFFFFLL -+#define JSVAL_TAG_MASK 0xFFFF000000000000LL - #define JSVAL_TYPE_TO_TAG(type) ((JSValueTag)(JSVAL_TAG_MAX_DOUBLE | (type))) - #define JSVAL_TYPE_TO_SHIFTED_TAG(type) (((uint64)JSVAL_TYPE_TO_TAG(type)) << JSVAL_TAG_SHIFT) - -@@ -297,8 +298,8 @@ - #if (!defined(_WIN64) && defined(__cplusplus)) - /* MSVC does not pack these correctly :-( */ - struct { -- uint64 payload47 : 47; -- JSValueTag tag : 17; -+ uint64 payload48 : 48; -+ JSValueTag tag : 16; - } debugView; - #endif - struct { -@@ -339,8 +340,8 @@ - { - uint64 asBits; - struct { -- JSValueTag tag : 17; -- uint64 payload47 : 47; -+ JSValueTag tag : 16; -+ uint64 payload48 : 48; - } debugView; - struct { - union { -diff -urN js.orig/src/jsvalue.h js/src/jsvalue.h ---- js.orig/src/jsvalue.h 2016-04-08 08:44:39.417713832 +0000 -+++ js/src/jsvalue.h 2016-04-11 06:10:21.219479884 +0000 -@@ -255,7 +255,7 @@ - { - uint64 lbits = lhs.asBits, rbits = rhs.asBits; - return (lbits <= JSVAL_TAG_MAX_DOUBLE && rbits <= JSVAL_TAG_MAX_DOUBLE) || -- (((lbits ^ rbits) & 0xFFFF800000000000LL) == 0); -+ (((lbits ^ rbits) & 0xFFFF000000000000LL) == 0); - } - - static JS_ALWAYS_INLINE jsval_layout -@@ -277,7 +277,7 @@ - static JS_ALWAYS_INLINE JSValueType - JSVAL_EXTRACT_NON_DOUBLE_TYPE_IMPL(jsval_layout l) - { -- uint64 type = (l.asBits >> JSVAL_TAG_SHIFT) & 0xF; -+ uint64 type = (l.asBits >> JSVAL_TAG_SHIFT) & 0x7; - JS_ASSERT(type > JSVAL_TYPE_DOUBLE); - return (JSValueType)type; - } ---- js.orig/src/methodjit/MethodJIT.cpp 2016-10-12 13:08:07.307916254 -0400 -+++ js/src/methodjit/MethodJIT.cpp 2016-10-12 13:08:59.647918787 -0400 -@@ -186,8 +186,8 @@ - JS_STATIC_ASSERT(offsetof(VMFrame, savedRBX) == 0x58); - JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38); - --JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF800000000000LL); --JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x00007FFFFFFFFFFFLL); -+JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF000000000000LL); -+JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x0000FFFFFFFFFFFFLL); - - asm volatile ( - ".text\n" -@@ -204,8 +204,8 @@ - "pushq %rbx" "\n" - - /* Load mask registers. */ -- "movq $0xFFFF800000000000, %r13" "\n" -- "movq $0x00007FFFFFFFFFFF, %r14" "\n" -+ "movq $0xFFFF000000000000, %r13" "\n" -+ "movq $0x0000FFFFFFFFFFFF, %r14" "\n" - - /* Build the JIT frame. - * rdi = cx -@@ -675,8 +675,8 @@ - */ - JS_STATIC_ASSERT(offsetof(VMFrame, savedRBX) == 0x58); - JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38); --JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF800000000000LL); --JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x00007FFFFFFFFFFFLL); -+JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF000000000000LL); -+JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x0000FFFFFFFFFFFFLL); - - // Windows x64 uses assembler version since compiler doesn't support - // inline assembler diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch deleted file mode 100644 index c867e45ee4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43 - ---- js/src/Makefile.in -+++ js/src/Makefile.in -@@ -888,8 +888,8 @@ - ifeq (,$(HOST_BIN_SUFFIX)) - mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER) - @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER) -- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER) -- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER) -+ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER) -+ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER) - endif - endif - ifneq (,$(IMPORT_LIBRARY)) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch deleted file mode 100644 index 3927c87179..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch +++ /dev/null @@ -1,61 +0,0 @@ -# HG changeset patch -# User Mike Hommey -# Date 1303461188 -7200 -# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1 -# Parent c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec -Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary - -diff --git a/js/src/Makefile.in b/js/src/Makefile.in ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -383,17 +383,17 @@ CPPSRCS += checks.cc \ - platform.cc \ - utils.cc \ - $(NONE) - - # - # END enclude sources for V8 dtoa - ############################################# - --ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU))) -+ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU))) - - VPATH += $(srcdir)/assembler \ - $(srcdir)/assembler/wtf \ - $(srcdir)/yarr/pcre \ - $(NULL) - - CPPSRCS += pcre_compile.cpp \ - pcre_exec.cpp \ - -# HG changeset patch -# User Luke Wagner -# Date 1299520258 28800 -# Node ID 68203913d04cf5be53fd16278816183d5670ba5c -# Parent 27e5814815491ebb68e474e453aff6c2ea908c43 -Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke) - -diff --git a/js/src/jsval.h b/js/src/jsval.h ---- a/js/src/jsval.h -+++ b/js/src/jsval.h -@@ -342,16 +342,17 @@ typedef union jsval_layout - JSValueTag tag : 17; - uint64 payload47 : 47; - } debugView; - struct { - union { - int32 i32; - uint32 u32; - JSWhyMagic why; -+ jsuword word; - } payload; - } s; - double asDouble; - void *asPtr; - } jsval_layout; - # endif /* JS_BITS_PER_WORD */ - #endif /* defined(IS_LITTLE_ENDIAN) */ - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-gcc6.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-gcc6.patch deleted file mode 100644 index ab2181faf6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-gcc6.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -upr a/js/src/jsapi.cpp b/js/src/jsapi.cpp ---- a/js/src/jsapi.cpp 2011-03-31 14:08:36.000000000 -0500 -+++ b/js/src/jsapi.cpp 2016-02-29 18:10:49.302307353 -0600 -@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob - AutoIdVector props(cx); - JSIdArray *ida; - if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida)) -- return false; -+ return NULL; - for (size_t n = 0; n < size_t(ida->length); ++n) - JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]); - return ida; -diff -upr a/js/src/jsfun.cpp b/js/src/jsfun.cpp ---- a/js/src/jsfun.cpp 2011-03-31 14:08:36.000000000 -0500 -+++ b/js/src/jsfun.cpp 2016-02-29 18:21:45.249674890 -0600 -@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje - - JSString *str = JS_DecompileFunction(cx, fun, indent); - if (!str) -- return false; -+ return NULL; - - if (!indent) - cx->compartment->toSourceCache.put(fun, str); -@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon - const Shape *shape = funobj->nativeLookup(id); - if (!shape) { - if (!ResolveInterpretedFunctionPrototype(cx, funobj)) -- return false; -+ return NULL; - shape = funobj->nativeLookup(id); - } - JS_ASSERT(!shape->configurable()); -diff -upr a/js/src/jsiter.cpp b/js/src/jsiter.cpp ---- a/js/src/jsiter.cpp 2011-03-31 14:08:36.000000000 -0500 -+++ b/js/src/jsiter.cpp 2016-02-29 18:24:22.494659919 -0600 -@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f - */ - JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0); - if (!obj) -- return false; -+ return NULL; - obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false); - obj->setMap(cx->compartment->emptyEnumeratorShape); - return obj; -diff -upr a/js/src/jsparse.cpp b/js/src/jsparse.cpp ---- a/js/src/jsparse.cpp 2011-03-31 14:08:36.000000000 -0500 -+++ b/js/src/jsparse.cpp 2016-02-29 18:29:03.997437475 -0600 -@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun - if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) { - JS_ASSERT(pn->pn_cookie.isFree()); - if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom)) -- return false; -+ return NULL; - } - - pn->pn_blockid = outertc->blockid(); -diff -upr a/js/src/jsstr.cpp b/js/src/jsstr.cpp ---- a/js/src/jsstr.cpp 2011-03-31 14:08:36.000000000 -0500 -+++ b/js/src/jsstr.cpp 2016-02-29 19:01:45.857779836 -0600 -@@ -1734,7 +1734,7 @@ class RegExpGuard - if (flat) { - patstr = flattenPattern(cx, fm.patstr); - if (!patstr) -- return false; -+ return NULL; - } else { - patstr = fm.patstr; - } -@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObje - UndefinedValue(), NULL, NULL, - JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0, - NULL)) { -- return JS_FALSE; -+ return NULL; - } - - return proto; -diff -upr a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp ---- a/js/src/jstypedarray.cpp 2011-03-31 14:08:36.000000000 -0500 -+++ b/js/src/jstypedarray.cpp 2016-02-29 19:08:53.541136191 -0600 -@@ -1334,7 +1334,7 @@ class TypedArrayTemplate - if (size != 0 && count >= INT32_MAX / size) { - JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, - JSMSG_NEED_DIET, "size and count"); -- return false; -+ return NULL; - } - - int32 bytelen = size * count; -@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint - - default: - JS_NOT_REACHED("shouldn't have gotten here"); -- return false; -+ return NULL; - } - } - -diff -upr a/js/src/jsxml.cpp b/js/src/jsxml.cpp ---- a/js/src/jsxml.cpp 2011-03-31 14:08:36.000000000 -0500 -+++ b/js/src/jsxml.cpp 2016-02-29 19:17:10.363279731 -0600 -@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS - - obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass); - if (!obj) -- return JS_FALSE; -+ return NULL; - JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal())); - JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal())); - JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared())); -@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb - size_t length = str->length(); - jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar)); - if (!chars) -- return JS_FALSE; -+ return NULL; - *chars = '@'; - const jschar *strChars = str->getChars(cx); - if (!strChars) { -diff -upr a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp ---- a/js/src/methodjit/InvokeHelpers.cpp 2011-03-31 14:08:36.000000000 -0500 -+++ b/js/src/methodjit/InvokeHelpers.cpp 2016-02-29 20:34:14.496983346 -0600 -@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx) - { - JSStackFrame *fp = cx->fp(); - if (fp->hasImacropc()) -- return false; -+ return NULL; - - JSScript *script = fp->script(); - return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc); -diff -upr a/js/src/nanojit/NativeX64.cpp b/js/src/nanojit/NativeX64.cpp ---- a/js/src/nanojit/NativeX64.cpp 2011-03-31 14:08:36.000000000 -0500 -+++ b/js/src/nanojit/NativeX64.cpp 2016-02-29 20:19:56.487934808 -0600 -@@ -1899,7 +1899,7 @@ namespace nanojit - } - } - -- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0}; -+ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {int64_t(0x8000000000000000LL),0}; - - void Assembler::asm_fneg(LIns *ins) { - Register rr, ra; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-fix.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-fix.patch deleted file mode 100644 index bebe558718..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=589735 - ---- a/js/src/jsgcchunk.cpp 2011-03-31 21:08:36.000000000 +0200 -+++ b/js/src/jsgcchunk.cpp 2012-11-02 10:36:08.324453878 +0100 -@@ -318,15 +318,48 @@ - static void * - MapPages(void *addr, size_t size) - { -+#if defined(__ia64__) -+ /* -+ * The JS engine assumes that all allocated pointers have their high 17 bits clear, -+ * which ia64's mmap doesn't support directly. However, we can emulate it by passing -+ * mmap an "addr" parameter with those bits clear. The mmap will return that address, -+ * or the nearest available memory above that address, providing a near-guarantee -+ * that those bits are clear. If they are not, we return NULL below to indicate -+ * out-of-memory. -+ * -+ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual -+ * address space. -+ * -+ * See Bug 589735 for more information. -+ */ -+#endif -+ - /* - * We don't use MAP_FIXED here, because it can cause the *replacement* - * of existing mappings, and we only want to create new mappings. - */ -+#if defined(__ia64__) -+ void *p = mmap(addr ? addr : (void*)0x0000070000000000, -+ size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -+ -1, 0); -+#else - void *p = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, - -1, 0); -+#endif - if (p == MAP_FAILED) - return NULL; -+#if defined(__ia64__) -+ /* -+ * If the caller requested a specific memory location, verify that's what mmap returned. -+ * Otherwise: If the allocated memory doesn't have its upper 17 bits clear, consider it -+ * as out of memory. -+ */ -+ if (addr && p != addr -+ || !addr && ((long long)p & 0xffff800000000000)) { -+#else -+ /* If the caller requested a specific memory location, verify that's what mmap returned. */ - if (addr && p != addr) { -+#endif - /* We succeeded in mapping memory, but not in the right place. */ - JS_ALWAYS_TRUE(munmap(p, size) == 0); - return NULL; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-static-strings.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-static-strings.patch deleted file mode 100644 index 5cfed32ae6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-ia64-static-strings.patch +++ /dev/null @@ -1,381 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=589735 - ---- a/js/src/jsatom.cpp 2011-03-31 21:08:36.000000000 +0200 -+++ b/js/src/jsatom.cpp 2012-11-02 10:43:16.970562590 +0100 -@@ -603,11 +603,13 @@ - JSString str, *str2; - JSAtomState *state; - -+#ifdef JS_HAS_STATIC_STRINGS - if (length == 1) { - jschar c = *chars; - if (c < UNIT_STRING_LIMIT) - return STRING_TO_ATOM(JSString::unitString(c)); - } -+#endif - - str.initFlatNotTerminated((jschar *)chars, length); - state = &cx->runtime->atomState; ---- a/js/src/jsiter.cpp 2011-03-31 21:08:36.000000000 +0200 -+++ b/js/src/jsiter.cpp 2012-11-02 10:43:16.974562590 +0100 -@@ -1002,9 +1002,12 @@ - - JSString *str; - jsint i; -+#ifdef JS_HAS_STATIC_STRINGS - if (rval->isInt32() && (jsuint(i = rval->toInt32()) < INT_STRING_LIMIT)) { - str = JSString::intString(i); -- } else { -+ } else -+#endif -+ { - str = js_ValueToString(cx, *rval); - if (!str) - return false; ---- a/js/src/jsnum.cpp 2011-03-31 21:08:36.000000000 +0200 -+++ b/js/src/jsnum.cpp 2012-11-02 10:43:16.982562589 +0100 -@@ -605,8 +605,10 @@ - { - uint32 ui; - if (si >= 0) { -+#ifdef JS_HAS_STATIC_STRINGS - if (si < INT_STRING_LIMIT) - return JSString::intString(si); -+#endif - ui = si; - } else { - ui = uint32(-si); -@@ -1169,6 +1171,7 @@ - - int32_t i; - if (JSDOUBLE_IS_INT32(d, &i)) { -+#ifdef JS_HAS_STATIC_STRINGS - if (base == 10 && jsuint(i) < INT_STRING_LIMIT) - return JSString::intString(i); - if (jsuint(i) < jsuint(base)) { -@@ -1176,6 +1179,7 @@ - return JSString::intString(i); - return JSString::unitString(jschar('a' + i - 10)); - } -+#endif - - if (JSString *str = c->dtoaCache.lookup(base, d)) - return str; ---- a/js/src/jsstr.cpp 2011-03-31 21:08:36.000000000 +0200 -+++ b/js/src/jsstr.cpp 2012-11-02 10:43:16.990562588 +0100 -@@ -3121,6 +3121,8 @@ - JS_FS_END - }; - -+#ifdef JS_HAS_STATIC_STRINGS -+ - /* - * Set up some tools to make it easier to generate large tables. After constant - * folding, for each n, Rn(0) is the comma-separated list R(0), R(1), ..., R(2^n-1). -@@ -3291,6 +3293,8 @@ - #undef R3 - #undef R7 - -+#endif /* defined(JS_HAS_STATIC_STRINGS) */ -+ - JSBool - js_String(JSContext *cx, uintN argc, Value *vp) - { -@@ -3331,6 +3335,7 @@ - uint16_t code; - if (!ValueToUint16(cx, argv[0], &code)) - return JS_FALSE; -+#ifdef JS_HAS_STATIC_STRINGS - if (code < UNIT_STRING_LIMIT) { - str = JSString::unitString(code); - if (!str) -@@ -3338,6 +3343,7 @@ - vp->setString(str); - return JS_TRUE; - } -+#endif - argv[0].setInt32(code); - } - chars = (jschar *) cx->malloc((argc + 1) * sizeof(jschar)); -@@ -3367,8 +3373,10 @@ - { - JS_ASSERT(JS_ON_TRACE(cx)); - jschar c = (jschar)i; -+#ifdef JS_HAS_STATIC_STRINGS - if (c < UNIT_STRING_LIMIT) - return JSString::unitString(c); -+#endif - return js_NewStringCopyN(cx, &c, 1); - } - #endif ---- a/js/src/jsstr.h 2011-03-31 21:08:36.000000000 +0200 -+++ b/js/src/jsstr.h 2012-11-02 10:43:16.998562587 +0100 -@@ -57,6 +57,15 @@ - #include "jsvalue.h" - #include "jscell.h" - -+#if !defined(__ia64__) -+/* -+ * Don't use static strings on ia64 since the compiler may put the static -+ * memory out of the acceptable 47-bit jsval pointer range. -+ */ -+# define JS_HAS_STATIC_STRINGS -+#endif -+ -+#ifdef JS_HAS_STATIC_STRINGS - enum { - UNIT_STRING_LIMIT = 256U, - SMALL_CHAR_LIMIT = 128U, /* Bigger chars cannot be in a length-2 string. */ -@@ -64,6 +73,7 @@ - INT_STRING_LIMIT = 256U, - NUM_HUNDRED_STRINGS = 156U - }; -+#endif - - extern jschar * - js_GetDependentStringChars(JSString *str); -@@ -380,10 +390,15 @@ - typedef uint8 SmallChar; - - static inline bool fitsInSmallChar(jschar c) { -+#ifdef JS_HAS_STATIC_STRINGS - return c < SMALL_CHAR_LIMIT && toSmallChar[c] != INVALID_SMALL_CHAR; -+#else -+ return false; -+#endif - } - - static inline bool isUnitString(void *ptr) { -+#ifdef JS_HAS_STATIC_STRINGS - jsuword delta = reinterpret_cast(ptr) - - reinterpret_cast(unitStringTable); - if (delta >= UNIT_STRING_LIMIT * sizeof(JSString)) -@@ -392,9 +407,13 @@ - /* If ptr points inside the static array, it must be well-aligned. */ - JS_ASSERT(delta % sizeof(JSString) == 0); - return true; -+#else -+ return false; -+#endif - } - - static inline bool isLength2String(void *ptr) { -+#ifdef JS_HAS_STATIC_STRINGS - jsuword delta = reinterpret_cast(ptr) - - reinterpret_cast(length2StringTable); - if (delta >= NUM_SMALL_CHARS * NUM_SMALL_CHARS * sizeof(JSString)) -@@ -403,9 +422,13 @@ - /* If ptr points inside the static array, it must be well-aligned. */ - JS_ASSERT(delta % sizeof(JSString) == 0); - return true; -+#else -+ return false; -+#endif - } - - static inline bool isHundredString(void *ptr) { -+#ifdef JS_HAS_STATIC_STRINGS - jsuword delta = reinterpret_cast(ptr) - - reinterpret_cast(hundredStringTable); - if (delta >= NUM_HUNDRED_STRINGS * sizeof(JSString)) -@@ -414,6 +437,9 @@ - /* If ptr points inside the static array, it must be well-aligned. */ - JS_ASSERT(delta % sizeof(JSString) == 0); - return true; -+#else -+ return false; -+#endif - } - - static inline bool isStatic(void *ptr) { -@@ -424,6 +450,7 @@ - #pragma align 8 (__1cIJSStringPunitStringTable_, __1cIJSStringSlength2StringTable_, __1cIJSStringShundredStringTable_) - #endif - -+#ifdef JS_HAS_STATIC_STRINGS - static const SmallChar INVALID_SMALL_CHAR = -1; - - static const jschar fromSmallChar[]; -@@ -436,6 +463,7 @@ - * strings, we keep a table to map from integer to the correct string. - */ - static const JSString *const intStringTable[]; -+#endif - - static JSFlatString *unitString(jschar c); - static JSLinearString *getUnitString(JSContext *cx, JSString *str, size_t index); ---- a/js/src/jsstrinlines.h 2011-03-31 21:08:36.000000000 +0200 -+++ b/js/src/jsstrinlines.h 2012-11-02 10:43:17.010562586 +0100 -@@ -215,52 +215,75 @@ - inline JSFlatString * - JSString::unitString(jschar c) - { -+#ifdef JS_HAS_STATIC_STRINGS - JS_ASSERT(c < UNIT_STRING_LIMIT); - return const_cast(&unitStringTable[c])->assertIsFlat(); -+#else -+ JS_NOT_REACHED("no static strings"); -+ return NULL; -+#endif - } - - inline JSLinearString * - JSString::getUnitString(JSContext *cx, JSString *str, size_t index) - { - JS_ASSERT(index < str->length()); -+#ifdef JS_HAS_STATIC_STRINGS - const jschar *chars = str->getChars(cx); - if (!chars) - return NULL; - jschar c = chars[index]; - if (c < UNIT_STRING_LIMIT) - return unitString(c); -+#endif - return js_NewDependentString(cx, str, index, 1); - } - - inline JSFlatString * - JSString::length2String(jschar c1, jschar c2) - { -+#ifdef JS_HAS_STATIC_STRINGS - JS_ASSERT(fitsInSmallChar(c1)); - JS_ASSERT(fitsInSmallChar(c2)); - return const_cast ( - &length2StringTable[(((size_t)toSmallChar[c1]) << 6) + toSmallChar[c2]] - )->assertIsFlat(); -+#else -+ JS_NOT_REACHED("no static strings"); -+ return NULL; -+#endif - } - - inline JSFlatString * - JSString::length2String(uint32 i) - { -+#ifdef JS_HAS_STATIC_STRINGS - JS_ASSERT(i < 100); - return length2String('0' + i / 10, '0' + i % 10); -+#else -+ JS_NOT_REACHED("no static strings"); -+ return NULL; -+#endif - } - - inline JSFlatString * - JSString::intString(jsint i) - { -+#ifdef JS_HAS_STATIC_STRINGS - jsuint u = jsuint(i); - JS_ASSERT(u < INT_STRING_LIMIT); - return const_cast(JSString::intStringTable[u])->assertIsFlat(); -+#else -+ JS_NOT_REACHED("no static strings"); -+ return NULL; -+#endif - } - - /* Get a static atomized string for chars if possible. */ - inline JSFlatString * - JSString::lookupStaticString(const jschar *chars, size_t length) - { -+#ifdef JS_HAS_STATIC_STRINGS - if (length == 1) { - if (chars[0] < UNIT_STRING_LIMIT) - return unitString(chars[0]); -@@ -290,6 +313,7 @@ - return intString(i); - } - } -+#endif - - return NULL; - } ---- a/js/src/jstracer.cpp 2011-03-31 21:08:36.000000000 +0200 -+++ b/js/src/jstracer.cpp 2012-11-02 10:43:17.022562584 +0100 -@@ -11505,6 +11505,7 @@ - } - if (vp[1].isString()) { - JSString *str = vp[1].toString(); -+#ifdef JS_HAS_STATIC_STRINGS - if (native == js_str_charAt) { - jsdouble i = vp[2].toNumber(); - if (JSDOUBLE_IS_NaN(i)) -@@ -11518,7 +11519,9 @@ - set(&vp[0], char_ins); - pendingSpecializedNative = IGNORE_NATIVE_CALL_COMPLETE_CALLBACK; - return RECORD_CONTINUE; -- } else if (native == js_str_charCodeAt) { -+ } else -+#endif -+ if (native == js_str_charCodeAt) { - jsdouble i = vp[2].toNumber(); - if (JSDOUBLE_IS_NaN(i)) - i = 0; -@@ -12967,6 +12970,7 @@ - JS_STATIC_ASSERT(sizeof(JSString) == 16 || sizeof(JSString) == 32); - - -+#ifdef JS_HAS_STATIC_STRINGS - JS_REQUIRES_STACK LIns* - TraceRecorder::getUnitString(LIns* str_ins, LIns* idx_ins) - { -@@ -13010,6 +13014,7 @@ - } - return RECORD_CONTINUE; - } -+#endif - - // Typed array tracing depends on EXPANDED_LOADSTORE and F2I - #if NJ_EXPANDED_LOADSTORE_SUPPORTED && NJ_F2I_SUPPORTED -@@ -13044,6 +13049,7 @@ - LIns* obj_ins = get(&lval); - LIns* idx_ins = get(&idx); - -+#ifdef JS_HAS_STATIC_STRINGS - // Special case for array-like access of strings. - if (lval.isString() && hasInt32Repr(idx)) { - if (call) -@@ -13056,6 +13062,7 @@ - set(&lval, char_ins); - return ARECORD_CONTINUE; - } -+#endif - - if (lval.isPrimitive()) - RETURN_STOP_A("JSOP_GETLEM on a primitive"); ---- a/js/src/jstracer.h 2011-03-31 21:08:36.000000000 +0200 -+++ b/js/src/jstracer.h 2012-11-02 10:43:17.034562582 +0100 -@@ -1394,10 +1394,12 @@ - JS_REQUIRES_STACK RecordingStatus getCharCodeAt(JSString *str, - nanojit::LIns* str_ins, nanojit::LIns* idx_ins, - nanojit::LIns** out_ins); -+#ifdef JS_HAS_STATIC_STRINGS - JS_REQUIRES_STACK nanojit::LIns* getUnitString(nanojit::LIns* str_ins, nanojit::LIns* idx_ins); - JS_REQUIRES_STACK RecordingStatus getCharAt(JSString *str, - nanojit::LIns* str_ins, nanojit::LIns* idx_ins, - JSOp mode, nanojit::LIns** out_ins); -+#endif - - JS_REQUIRES_STACK RecordingStatus initOrSetPropertyByName(nanojit::LIns* obj_ins, - Value* idvalp, Value* rvalp, ---- a/js/src/tracejit/Writer.cpp 2011-03-31 21:08:36.000000000 +0200 -+++ b/js/src/tracejit/Writer.cpp 2012-11-02 10:43:17.038562582 +0100 -@@ -246,7 +246,9 @@ - // ins = andq ins_oprnd1, ins_oprnd2 - ret = true; - #endif -- } else if (ins->isop(LIR_addp) && -+ } -+#ifdef JS_HAS_STATIC_STRINGS -+ else if (ins->isop(LIR_addp) && - ((ins->oprnd1()->isImmP() && - (void *)ins->oprnd1()->immP() == JSString::unitStringTable) || - (ins->oprnd2()->isImmP() && -@@ -258,6 +260,7 @@ - // ins = addp JSString::unitStringTable, ... - ret = true; - } -+#endif - - return ret; - } diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-isfinite.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-isfinite.patch deleted file mode 100644 index edf4d01e64..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-isfinite.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/jsnum.h 2011-03-03 05:43:06.000000000 -0500 -+++ js/src/jsnum.h.new 2012-08-16 14:58:04.000000000 -0400 -@@ -97,6 +97,8 @@ - { - #ifdef WIN32 - return _finite(d); -+#elif defined(__UCLIBC__) -+ return isfinite(d); - #else - return finite(d); - #endif diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-no-link-lib-deps.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-no-link-lib-deps.patch deleted file mode 100644 index 5375858a6c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-no-link-lib-deps.patch +++ /dev/null @@ -1,32 +0,0 @@ -This build system appears to allow for the use of -lfoo form to link -against locally built libraries. However this appears to not be used -and the automatic addition of -lfoo libs to make's dependencies breaks -when an alternate $ROOT is set because make's search for -lfoo libs -is incomplete and only considers /lib and /usr/lib. - ---- js-1.8.5/js/src/config/rules.mk.orig 2015-10-12 15:34:30.641354103 -0700 -+++ js-1.8.5/js/src/config/rules.mk 2015-10-12 15:35:33.845673943 -0700 -@@ -860,23 +860,6 @@ - HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX), $(HOST_LIBS)) - DSO_LDOPTS_DEPS = $(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS)) - --ifndef _LIBNAME_RELATIVE_PATHS -- --LIBS_DEPS += $(filter -l%, $(LIBS)) --HOST_LIBS_DEPS += $(filter -l%, $(HOST_LIBS)) --DSO_LDOPTS_DEPS += $(filter -l%, $(EXTRA_DSO_LDOPTS)) -- --_LIBDIRS = $(patsubst -L%,%,$(filter -L%, $(LIBS) $(HOST_LIBS) $(EXTRA_DSO_LDOPTS))) --ifneq (,$(_LIBDIRS)) --vpath $(LIB_PREFIX)%.$(LIB_SUFFIX) $(_LIBDIRS) --ifdef IMPORT_LIB_SUFFIX --vpath $(LIB_PREFIX)%.$(IMPORT_LIB_SUFFIX) $(_LIBDIRS) --endif # IMPORT_LIB_SUFFIX --vpath $(DLL_PREFIX)%$(DLL_SUFFIX) $(_LIBDIRS) --endif # _LIBDIRS -- --endif # _LIBNAME_RELATIVE_PATHS -- - # Dependencies which, if modified, should cause everything to rebuild - GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch deleted file mode 100644 index 66475b6c34..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/js/src/configure.in 2012-11-01 19:42:20.130330321 +0100 -+++ b/js/src/configure.in 2012-11-01 20:34:03.561351492 +0100 -@@ -3477,7 +3477,16 @@ - esac - - dnl Performance measurement headers. --AC_CHECK_HEADER(linux/perf_event.h, HAVE_LINUX_PERF_EVENT_H=1) -+AC_CHECK_HEADER(linux/perf_event.h, -+ [AC_CACHE_CHECK(for perf_event_open system call,ac_cv_perf_event_open, -+ [AC_TRY_COMPILE([#include ],[return sizeof(__NR_perf_event_open);], -+ ac_cv_perf_event_open=yes, -+ ac_cv_perf_event_open=no)])]) -+if test "$ac_cv_perf_event_open" = "yes"; then -+ HAVE_LINUX_PERF_EVENT_H=1 -+else -+ HAVE_LINUX_PERF_EVENT_H= -+fi - AC_SUBST(HAVE_LINUX_PERF_EVENT_H) - - dnl Checks for libraries. - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch deleted file mode 100644 index 460394d33f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur js/src/configure.in js.new/src/configure.in ---- a/js/src/symverscript.in 2012-11-07 09:36:16.000000000 -0500 -+++ b/js/src/symverscript.in 2012-11-07 09:37:05.000000000 -0500 -@@ -0,0 +1,4 @@ -+mozjs185 { -+ global: *; -+}; -+ -diff -Naur js/src/Makefile.in js.new/src/Makefile.in ---- a/js/src/Makefile.in 2012-11-07 09:36:16.000000000 -0500 -+++ b/js/src/Makefile.in 2012-11-07 09:37:09.000000000 -0500 -@@ -837,7 +837,10 @@ - mozjs185.pc \ - $(NULL) - --GARBAGE += $(pkg_config_files) -+symverscript: symverscript.in -+ cat $< > $@ -+ -+GARBAGE += $(pkg_config_files) symverscript - - %.pc: $(srcdir)/%.pc.in Makefile - cat $< | sed \ -@@ -872,6 +875,8 @@ - SHLIB_ABI_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION) - SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION) - $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER)) -+$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript -+$(SHARED_LIBRARY): symverscript - endif - endif - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch deleted file mode 100644 index 4324df0d60..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.7-freebsd-pthreads.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/js/src/config/system-headers -+++ b/js/src/config/system-headers -@@ -595,6 +595,7 @@ proto/exec.h - psap.h - Pt.h - pthread.h -+pthread_np.h - pwd.h - Python.h - QDOffscreen.h - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch deleted file mode 100644 index c3996ae82b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-perl-defined-array-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/js/src/config/milestone.pl 2013-02-11 17:33:22.000000000 -0500 -+++ b/js/src/config/milestone.pl 2015-07-15 10:44:31.676153600 -0400 -@@ -55,7 +55,7 @@ - # - my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE); - --if (defined(@TEMPLATE_FILE)) { -+if (@TEMPLATE_FILE) { - my $TFILE; - - foreach $TFILE (@TEMPLATE_FILE) { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/metadata.xml deleted file mode 100644 index ec0cd3c674..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - mozilla - - Stand-alone JavaScript C library - - - Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems - Build a threadsafe version of spidermonkey - Use the system-wide dev-libs/icu instead of bundled -- note, only takes effect when icu flag is enabled - - - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild deleted file mode 100644 index d309947b61..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -WANT_AUTOCONF="2.1" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" -inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator pax-utils - -MY_PN="js" -TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))" -MY_P="${MY_PN}-${PV}" -TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0" -DESCRIPTION="Stand-alone JavaScript C library" -HOMEPAGE="http://www.mozilla.org/js/spidermonkey/" -SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz" - -LICENSE="NPL-1.1" -SLOT="0/mozjs185" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos" -IUSE="debug minimal static-libs test" - -S="${WORKDIR}/${MY_P}" -BUILDDIR="${S}/js/src" - -RDEPEND=">=dev-libs/nspr-4.7.0 - x64-macos? ( dev-libs/jemalloc )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/zip - virtual/pkgconfig" - -pkg_setup(){ - if [[ ${MERGE_TYPE} != "binary" ]]; then - export LC_ALL="C" - fi -} - -src_prepare() { - # https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43 - epatch "${FILESDIR}/${P}-fix-install-symlinks.patch" - # https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9 - epatch "${FILESDIR}/${P}-fix-ppc64.patch" - # https://bugs.gentoo.org/show_bug.cgi?id=400727 - # https://bugs.gentoo.org/show_bug.cgi?id=420471 - epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch" - # https://bugs.gentoo.org/show_bug.cgi?id=438746 - epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch - # https://bugs.gentoo.org/show_bug.cgi?id=441928 - epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch - # https://bugs.gentoo.org/show_bug.cgi?id=439260 - epatch "${FILESDIR}"/${P}-symbol-versions.patch - # https://bugs.gentoo.org/show_bug.cgi?id=441934 - epatch "${FILESDIR}"/${PN}-1.8.5-ia64-fix.patch - epatch "${FILESDIR}"/${PN}-1.8.5-ia64-static-strings.patch - # https://bugs.gentoo.org/show_bug.cgi?id=431560 - epatch "${FILESDIR}"/${PN}-1.8.5-isfinite.patch - # https://bugs.gentoo.org/show_bug.cgi?id=552786 - epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch - # fix builds for alternate $ROOT locations - epatch "${FILESDIR}"/${P}-no-link-lib-deps.patch - # https://bugs.gentoo.org/show_bug.cgi?id=582478 - epatch "${FILESDIR}"/${P}-gcc6.patch - # Fix for CONFIG_ARM64_VA_BITS_48=y - # https://github.com/coreos/coreos-overlay/pull/2241 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1143022 - # https://bugzilla.redhat.com/show_bug.cgi?id=1242326 - if [[ "${ARCH}" == "arm64" ]]; then - epatch "${FILESDIR}/${P}-fix-arm64-va-48.patch" - fi - - epatch_user - - cd "${BUILDDIR}" || die - eautoconf -} - -src_configure() { - local nspr_cflags nspr_libs - cd "${BUILDDIR}" || die - - # Mozilla screws up the meaning of BUILD, HOST, and TARGET :( - tc-export_build_env CC CXX LD AR RANLIB PKG_CONFIG \ - BUILD_CC BUILD_CXX BUILD_LD BUILD_AR BUILD_RANLIB - export HOST_CC="${BUILD_CC}" HOST_CFLAGS="${BUILD_CFLAGS}" \ - HOST_CXX="${BUILD_CXX}" HOST_CXXFLAGS="${BUILD_CXXFLAGS}" \ - HOST_LD="${BUILD_LD}" HOST_LDFLAGS="${BUILD_LDFLAGS}" \ - HOST_AR="${BUILD_AR}" HOST_RANLIB="${BUILD_RANLIB}" - - # Use pkg-config instead of nspr-config to use $SYSROOT - nspr_cflags="$(${PKG_CONFIG} --cflags nspr)" || die - nspr_libs="$(${PKG_CONFIG} --libs nspr)" || die - - econf \ - ${myopts} \ - --host="${CBUILD}" \ - --target="${CHOST}" \ - --enable-jemalloc \ - --enable-readline \ - --enable-threadsafe \ - --with-nspr-cflags="${nspr_cflags}" \ - --with-nspr-libs="${nspr_libs}" \ - $(use_enable debug) \ - $(use_enable static-libs static) \ - $(use_enable test tests) -} - -src_compile() { - cd "${BUILDDIR}" || die - emake -} - -src_test() { - cd "${BUILDDIR}/jsapi-tests" || die - # for bug 415791 - pax-mark mr jsapi-tests - emake check -} - -src_install() { - cd "${BUILDDIR}" || die - emake DESTDIR="${D}" install - # bug 437520 , exclude js shell for small systems - if ! use minimal ; then - dobin shell/js - pax-mark m "${ED}/usr/bin/js" - fi - dodoc ../../README - dohtml README.html - - if ! use static-libs; then - # We can't actually disable building of static libraries - # They're used by the tests and in a few other places - find "${D}" -iname '*.a' -delete || die - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6 deleted file mode 100644 index acffb141b1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test -DEPEND=>=dev-libs/nspr-4.7.0 x64-macos? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) app-arch/zip virtual/pkgconfig >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 -DESCRIPTION=Stand-alone JavaScript C library -EAPI=5 -HOMEPAGE=http://www.mozilla.org/js/spidermonkey/ -IUSE=debug minimal static-libs test -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos -LICENSE=NPL-1.1 -RDEPEND=>=dev-libs/nspr-4.7.0 x64-macos? ( dev-libs/jemalloc ) -SLOT=0/mozjs185 -SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 -_md5_=c674255eca6d8201ff4579adebb9576a From d93aac18e991bb640005ed3cec649e556598b592 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 20:14:30 +0000 Subject: [PATCH 10/22] app-portage/eclass-manpages: Move back to portage-stable --- .../eclass-manpages-20130110.ebuild | 39 -- .../files/eclass-to-manpage.awk | 416 ------------------ .../files/eclass-to-manpage.sh | 36 -- .../app-portage/eclass-manpages/metadata.xml | 8 - .../app-portage/eclass-manpages-20130110 | 8 - 5 files changed, 507 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/eclass-manpages-20130110.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.awk delete mode 100755 sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.sh delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-portage/eclass-manpages-20130110 diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/eclass-manpages-20130110.ebuild b/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/eclass-manpages-20130110.ebuild deleted file mode 100644 index dbe1dc7deb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/eclass-manpages-20130110.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/eclass-manpages-20130110.ebuild,v 1.2 2013/01/10 17:21:58 vapier Exp $ - -EAPI="4" - -DESCRIPTION="collection of Gentoo eclass manpages" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -S=${WORKDIR} - -genit() { - local e=${1:-${ECLASSDIR}} - einfo "Generating man pages from: ${e}" - env ECLASSDIR=${e} "${FILESDIR}"/eclass-to-manpage.sh || die -} - -src_compile() { - # First process any eclasses found in overlays. Then process - # the main eclassdir last so that its output will clobber anything - # that might have come from overlays. Main tree wins! - local o e - for o in ${PORTDIR_OVERLAY} ; do - e="${o}/eclass" - [[ -d ${e} ]] || continue - genit "${e}" - done - genit -} - -src_install() { - doman *.5 -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.awk b/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.awk deleted file mode 100644 index b7e1627525..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.awk +++ /dev/null @@ -1,416 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/files/eclass-to-manpage.awk,v 1.28 2013/01/10 17:42:39 vapier Exp $ - -# This awk converts the comment documentation found in eclasses -# into man pages for easier/nicer reading. -# -# If you wish to have multiple paragraphs in a description, then -# create empty comment lines. Paragraph parsing ends when the comment -# block does. - -# The format of the eclass description: -# @ECLASS: foo.eclass -# @MAINTAINER: -# -# @AUTHOR: -# -# @BUGREPORTS: -# -# @VCSURL: -# @BLURB: -# @DESCRIPTION: -# -# @EXAMPLE: -# - -# The format of functions: -# @FUNCTION: foo -# @USAGE: [optional arguments to foo] -# @RETURN: -# @MAINTAINER: -# -# [@INTERNAL] -# @DESCRIPTION: -# - -# The format of function-specific variables: -# @VARIABLE: foo -# [@DEFAULT_UNSET] -# [@INTERNAL] -# [@REQUIRED] -# @DESCRIPTION: -# -# foo="" - -# The format of eclass variables: -# @ECLASS-VARIABLE: foo -# [@DEFAULT_UNSET] -# [@INTERNAL] -# [@REQUIRED] -# @DESCRIPTION: -# -# foo="" - -# Common features: -# @CODE -# In multiline paragraphs, you can create chunks of unformatted -# code by using this marker at the start and end. -# @CODE -# -# @ROFF -# If you want a little more manual control over the formatting, you can -# insert roff macros directly into the output by using the @ROFF escape. - -function _stderr_msg(text, type, file, cnt) { - if (_stderr_header_done != 1) { - cnt = split(FILENAME, file, /\//) - print "\n" file[cnt] ":" > "/dev/stderr" - _stderr_header_done = 1 - } - - print " " type ":" NR ": " text > "/dev/stderr" -} -function warn(text) { - _stderr_msg(text, "warning") -} -function fail(text) { - _stderr_msg(text, "error") - exit(1) -} - -function eat_line() { - ret = $0 - sub(/^# @[A-Z]*:[[:space:]]*/,"",ret) - getline - return ret -} -function eat_paragraph() { - code = 0 - ret = "" - getline - while ($0 ~ /^#/) { - # Only allow certain tokens in the middle of paragraphs - if ($2 ~ /^@/ && $2 !~ /^@(CODE|ROFF)$/) - break - - sub(/^#[[:space:]]?/, "", $0) - - # Escape . at start of line #420153 - if ($0 ~ /^[.]/) - $0 = "\\&" $0 - - # Translate @CODE into @ROFF - if ($1 == "@CODE" && NF == 1) { - if (code) - $0 = "@ROFF .fi" - else - $0 = "@ROFF .nf" - code = !code - } - - # Allow people to specify *roff commands directly - if ($1 == "@ROFF") - sub(/^@ROFF[[:space:]]*/, "", $0) - - ret = ret "\n" $0 - - # Handle the common case of trailing backslashes in - # code blocks to cross multiple lines #335702 - if (code && $NF == "\\") - ret = ret "\\" - getline - } - sub(/^\n/,"",ret) - return ret -} - -function pre_text(p) { - return ".nf\n" p "\n.fi" -} - -function man_text(p) { - return gensub(/-/, "\\-", "g", p) -} - -# -# Handle an @ECLASS block -# -function handle_eclass() { - eclass = $3 - eclass_maintainer = "" - eclass_author = "" - blurb = "" - desc = "" - example = "" - - # first the man page header - print ".\\\" -*- coding: utf-8 -*-" - print ".\\\" ### DO NOT EDIT THIS FILE" - print ".\\\" ### This man page is autogenerated by eclass-to-manpage.awk" - print ".\\\" ### based on comments found in " eclass - print ".\\\"" - print ".\\\" See eclass-to-manpage.awk for documentation on how to get" - print ".\\\" your eclass nicely documented as well." - print ".\\\"" - print ".TH \"" toupper(eclass) "\" 5 \"" strftime("%b %Y") "\" \"Portage\" \"portage\"" - - # now eat the global data - getline - if ($2 == "@MAINTAINER:") - eclass_maintainer = eat_paragraph() - if ($2 == "@AUTHOR:") - eclass_author = eat_paragraph() - if ($2 == "@BUGREPORTS:") - reporting_bugs = eat_paragraph() - if ($2 == "@VCSURL:") - vcs_url = eat_line() - if ($2 == "@BLURB:") - blurb = eat_line() - if ($2 == "@DESCRIPTION:") - desc = eat_paragraph() - if ($2 == "@EXAMPLE:") - example = eat_paragraph() - # in case they typo-ed the keyword, bail now - if ($2 ~ /^@/) - fail(eclass ": unknown keyword " $2) - - # finally display it - print ".SH \"NAME\"" - print eclass " \\- " man_text(blurb) - if (desc != "") { - print ".SH \"DESCRIPTION\"" - print man_text(desc) - } - if (example != "") { - print ".SH \"EXAMPLE\"" - print man_text(example) - } - - # sanity checks - if (blurb == "") - fail(eclass ": no @BLURB found") - if (eclass_maintainer == "") - warn(eclass ": no @MAINTAINER found") -} - -# -# Handle a @FUNCTION block -# -function show_function_header() { - if (_function_header_done != 1) { - print ".SH \"FUNCTIONS\"" - _function_header_done = 1 - } -} -function handle_function() { - func_name = $3 - usage = "" - funcret = "" - maintainer = "" - internal = 0 - desc = "" - - # make sure people haven't specified this before (copy & paste error) - if (all_funcs[func_name]) - fail(eclass ": duplicate definition found for function: " func_name) - all_funcs[func_name] = func_name - - # grab the docs - getline - if ($2 == "@USAGE:") - usage = eat_line() - if ($2 == "@RETURN:") - funcret = eat_line() - if ($2 == "@MAINTAINER:") - maintainer = eat_paragraph() - if ($2 == "@INTERNAL") { - internal = 1 - getline - } - if ($2 == "@DESCRIPTION:") - desc = eat_paragraph() - - if (internal == 1) - return - - show_function_header() - - # now print out the stuff - print ".TP" - print "\\fB" func_name "\\fR " man_text(usage) - if (desc != "") - print man_text(desc) - if (funcret != "") { - if (desc != "") - print "" - print "Return value: " funcret - } - - if (blurb == "") - fail(func_name ": no @BLURB found") - if (desc == "" && funcret == "") - fail(func_name ": no @DESCRIPTION found") -} - -# -# Handle @VARIABLE and @ECLASS-VARIABLE blocks -# -function _handle_variable() { - var_name = $3 - desc = "" - val = "" - default_unset = 0 - internal = 0 - required = 0 - - # make sure people haven't specified this before (copy & paste error) - if (all_vars[var_name]) - fail(eclass ": duplicate definition found for variable: " var_name) - all_vars[var_name] = var_name - - # grab the optional attributes - opts = 1 - while (opts) { - getline - if ($2 == "@DEFAULT_UNSET") - default_unset = 1 - else if ($2 == "@INTERNAL") - internal = 1 - else if ($2 == "@REQUIRED") - required = 1 - else - opts = 0 - } - if ($2 == "@DESCRIPTION:") - desc = eat_paragraph() - - # extract the default variable value - # first try var="val" - op = "=" - regex = "^.*" var_name "=(.*)$" - val = gensub(regex, "\\1", "", $0) - if (val == $0) { - # next try : ${var:=val} - op = "?=" - regex = "^[[:space:]]*:[[:space:]]*[$]{" var_name ":?=(.*)}" - val = gensub(regex, "\\1", "", $0) - if (val == $0) { - if (default_unset + required + internal == 0) - warn(var_name ": unable to extract default variable content: " $0) - val = "" - } else if (val !~ /^["']/ && val ~ / /) { - if (default_unset == 1) - warn(var_name ": marked as unset, but has value: " val) - val = "\"" val "\"" - } - } - if (length(val)) - val = " " op " \\fI" val "\\fR" - if (required == 1) - val = val " (REQUIRED)" - - if (internal == 1) - return "" - - # now accumulate the stuff - ret = \ - ".TP" "\n" \ - "\\fB" var_name "\\fR" val "\n" \ - man_text(desc) - - if (desc == "") - fail(var_name ": no @DESCRIPTION found") - - return ret -} -function handle_variable() { - show_function_header() - ret = _handle_variable() - if (ret == "") - return - print ret -} -function handle_eclass_variable() { - ret = _handle_variable() - if (ret == "") - return - if (eclass_variables != "") - eclass_variables = eclass_variables "\n" - eclass_variables = eclass_variables ret -} - -# -# Spit out the common footer of manpage -# -function handle_footer() { - if (eclass_variables != "") { - print ".SH \"ECLASS VARIABLES\"" - print man_text(eclass_variables) - } - if (eclass_author != "") { - print ".SH \"AUTHORS\"" - print pre_text(man_text(eclass_author)) - } - if (eclass_maintainer != "") { - print ".SH \"MAINTAINERS\"" - print pre_text(man_text(eclass_maintainer)) - } - print ".SH \"REPORTING BUGS\"" - print reporting_bugs - print ".SH \"FILES\"" - print ".BR " eclassdir "/" eclass - print ".SH \"SEE ALSO\"" - print ".BR ebuild (5)" - print pre_text(gensub("@ECLASS@", eclass, "", vcs_url)) -} - -# -# Init parser -# -BEGIN { - state = "header" - if (PORTDIR == "") - PORTDIR = "/usr/portage" - eclassdir = PORTDIR "/eclass" - reporting_bugs = "Please report bugs via http://bugs.gentoo.org/" - vcs_url = "http://sources.gentoo.org/eclass/@ECLASS@?view=log" -} - -# -# Main parsing routine -# -{ - if (state == "header") { - if ($0 ~ /^# @ECLASS:/) { - handle_eclass() - state = "funcvar" - } else if ($0 == "# @DEAD") { - eclass = "dead" - exit(10) - } else if ($0 == "# @eclass-begin") { - fail("java documentation not supported") - } else if ($0 ~ /^# @/) - warn("Unexpected tag in \"" state "\" state: " $0) - } else if (state == "funcvar") { - if ($0 ~ /^# @FUNCTION:/) - handle_function() - else if ($0 ~ /^# @VARIABLE:/) - handle_variable() - else if ($0 ~ /^# @ECLASS-VARIABLE:/) - handle_eclass_variable() - else if ($0 ~ /^# @/) - warn("Unexpected tag in \"" state "\" state: " $0) - } -} - -# -# Tail end -# -END { - if (eclass == "") - fail("eclass not documented yet (no @ECLASS found)") - else if (eclass != "dead") - handle_footer() -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.sh b/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.sh deleted file mode 100755 index da97e37727..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/files/eclass-to-manpage.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -: ${PORTDIR:=/usr/portage} -: ${ECLASSDIR:=${0%/*}/../../../eclass} -: ${FILESDIR:=${ECLASSDIR}/../app-portage/eclass-manpages/files} - -AWK="gawk" -while [[ $# -gt 0 ]] ; do - case $1 in - -e) ECLASSDIR=$2; shift;; - -f) FILESDIR=$2; shift;; - -d) AWK="dgawk";; - *) break;; - esac - shift -done - -if [[ ! -d ${ECLASSDIR} ]] ; then - echo "Usage: ${0##*/} [-e eclassdir] [-f eclass-to-manpage.awk FILESDIR] [eclasses]" 1>&2 - exit 1 -fi - -[[ $# -eq 0 ]] && set -- "${ECLASSDIR}"/*.eclass - -for e in "$@" ; do - set -- \ - ${AWK} \ - -vPORTDIR="${PORTDIR}" \ - -f "${FILESDIR}"/eclass-to-manpage.awk \ - ${e} - if [[ ${AWK} == "gawk" ]] ; then - "$@" > ${e##*/}.5 || rm -f ${e##*/}.5 - else - "$@" - fi -done diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/metadata.xml deleted file mode 100644 index 584ce61c0c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/eclass-manpages/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - tools-portage - - vapier@gentoo.org - - diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-portage/eclass-manpages-20130110 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-portage/eclass-manpages-20130110 deleted file mode 100644 index 0a47915179..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-portage/eclass-manpages-20130110 +++ /dev/null @@ -1,8 +0,0 @@ -DEFINED_PHASES=compile install -DESCRIPTION=collection of Gentoo eclass manpages -EAPI=4 -HOMEPAGE=http://www.gentoo.org/ -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris -LICENSE=GPL-2 -SLOT=0 -_md5_=1769702052dba8eab80d12edb5b01398 From 0a2ed6897b101fd6805618a3661a6602cf226133 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 20:27:49 +0000 Subject: [PATCH 11/22] virtual/u-boot: Drop dead package --- .../metadata/md5-cache/virtual/u-boot-1 | 9 --------- .../coreos-overlay/virtual/u-boot/metadata.xml | 4 ---- .../virtual/u-boot/u-boot-1.ebuild | 16 ---------------- 3 files changed, 29 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/u-boot-1 delete mode 100644 sdk_container/src/third_party/coreos-overlay/virtual/u-boot/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/virtual/u-boot/u-boot-1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/u-boot-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/u-boot-1 deleted file mode 100644 index ea67cdbaa3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/u-boot-1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=- -DESCRIPTION=Chrome OS u-boot virtual package -EAPI=4 -HOMEPAGE=http://src.chromium.org -KEYWORDS=amd64 arm x86 -LICENSE=GPL-2 -RDEPEND=sys-boot/chromeos-u-boot -SLOT=0 -_md5_=dcf6dd7328b99ac163c91473a0ff2597 diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/u-boot/metadata.xml b/sdk_container/src/third_party/coreos-overlay/virtual/u-boot/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/virtual/u-boot/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/u-boot/u-boot-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/u-boot/u-boot-1.ebuild deleted file mode 100644 index 288fa41b78..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/virtual/u-boot/u-boot-1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="Chrome OS u-boot virtual package" -HOMEPAGE="http://src.chromium.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -RDEPEND=" - sys-boot/chromeos-u-boot -" From c596bcc9f8348d54ad3efc71de4548c7d1607efc Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 20:28:42 +0000 Subject: [PATCH 12/22] virtual/perf: Drop dead package --- .../metadata/md5-cache/virtual/perf-1 | 10 ---------- .../coreos-overlay/virtual/perf/metadata.xml | 4 ---- .../coreos-overlay/virtual/perf/perf-1.ebuild | 15 --------------- 3 files changed, 29 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/perf-1 delete mode 100644 sdk_container/src/third_party/coreos-overlay/virtual/perf/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/virtual/perf/perf-1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/perf-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/perf-1 deleted file mode 100644 index 66609276fa..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/perf-1 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=- -DESCRIPTION=Chrome OS perf virtual package -EAPI=0 -HOMEPAGE=http://src.chromium.org -IUSE=kernel_next -KEYWORDS=amd64 arm x86 -LICENSE=GPL-2 -RDEPEND=kernel_next? ( dev-util/perf-next ) !kernel_next? ( dev-util/perf ) -SLOT=0 -_md5_=678a887394e8e23f738e2af33743d6c5 diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/perf/metadata.xml b/sdk_container/src/third_party/coreos-overlay/virtual/perf/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/virtual/perf/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/perf/perf-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/perf/perf-1.ebuild deleted file mode 100644 index 5e02c3faa7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/virtual/perf/perf-1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -DESCRIPTION="Chrome OS perf virtual package" -HOMEPAGE="http://src.chromium.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="kernel_next" - -RDEPEND=" - kernel_next? ( dev-util/perf-next ) - !kernel_next? ( dev-util/perf ) -" From 61cec254e297bd736f2bafb0aa30298dfef7697c Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 17:20:34 +0000 Subject: [PATCH 13/22] sys-firmware/edk2: Move back to portage-stable (as edk2-ovmf) --- .../md5-cache/sys-firmware/edk2-2017.06-r2 | 13 -- .../md5-cache/sys-firmware/edk2-99999 | 13 -- .../coreos-overlay/sys-firmware/edk2/Manifest | 2 - .../sys-firmware/edk2/edk2-2017.06-r2.ebuild | 1 - .../sys-firmware/edk2/edk2-99999.ebuild | 130 ------------------ .../edk2/files/edk2-2017.06-BaseTools.patch | 60 -------- .../edk2/files/edk2-2017.06-edksetup.patch | 17 --- .../sys-firmware/edk2/metadata.xml | 4 - 8 files changed, 240 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-2017.06-r2 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-99999 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/Manifest delete mode 120000 sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-2017.06-r2.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-99999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-BaseTools.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-edksetup.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-2017.06-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-2017.06-r2 deleted file mode 100644 index f66b70c6ef..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-2017.06-r2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare unpack -DEPEND=amd64? ( >=dev-lang/nasm-2.10.0 sys-power/iasl ) -DESCRIPTION=EDK II Open Source UEFI Firmware -EAPI=5 -HOMEPAGE=https://github.com/tianocore/tianocore.github.io/wiki/EDK-II -IUSE=debug +qemu +secure-boot -KEYWORDS=-* arm64 amd64 -LICENSE=BSD-2 -RDEPEND=!sys-firmware/edk2-armvirt !sys-firmware/edk2-ovmf -SLOT=0 -SRC_URI=https://github.com/tianocore/edk2/archive/vUDK2017.tar.gz https://www.openssl.org/source/openssl-1.1.0f.tar.gz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=0a05a0e02ccbeeb2aad57e503aa964b4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-99999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-99999 deleted file mode 100644 index 8aab17c8c0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-99999 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare unpack -DEPEND=amd64? ( >=dev-lang/nasm-2.10.0 sys-power/iasl ) >=dev-vcs/git-1.8.2.1[curl] -DESCRIPTION=EDK II Open Source UEFI Firmware -EAPI=5 -HOMEPAGE=https://github.com/tianocore/tianocore.github.io/wiki/EDK-II -IUSE=debug +qemu +secure-boot -KEYWORDS=-* ~arm64 ~amd64 -LICENSE=BSD-2 -RDEPEND=!sys-firmware/edk2-armvirt !sys-firmware/edk2-ovmf -SLOT=0 -SRC_URI=https://www.openssl.org/source/openssl-1.1.0f.tar.gz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=0a05a0e02ccbeeb2aad57e503aa964b4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/Manifest deleted file mode 100644 index e4c5d6fb35..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST openssl-1.1.0f.tar.gz 5278176 SHA256 12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765 SHA512 340ab3f38c90dea346e543b58bc0eff0adede15be212ad20b7cf38718a7f94fab51996da414855c180540f7488b8bd31d8b9a0d04bb19159f735c46d8f6df22c WHIRLPOOL bb4ce1d100c5eb567de0139e4a1c0a2bb1cd308bd014704d6bb796d3fcfc16b91fe69839068944831746e0b937a6ccb234b5cea3b4911fab4283500ed380f0b6 -DIST vUDK2017.tar.gz 38737278 SHA256 4697c58206f1914eb3779e8515d8fd3de058d736ffdfc78e3e76708d7b7699f1 SHA512 62e42cd4523df0de5abf0d655c7e5a38298296fe2ee7bb504f0663bf576637fdc759cae5294a123623430c7711ecc90ffc2d6ff6265e1987e42502cc03d3a1d0 WHIRLPOOL c3d87b6f47347b15837f1da67ce3a06c66ecf2f6d04f03788b9cbda9fd5c7a46d677f79755d3f4a30b2ce79d0df48ba52aab1f5268e35cb02bca2e7cd4218a27 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-2017.06-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-2017.06-r2.ebuild deleted file mode 120000 index b562211f84..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-2017.06-r2.ebuild +++ /dev/null @@ -1 +0,0 @@ -edk2-99999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-99999.ebuild deleted file mode 100644 index 0fed3aeb11..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-99999.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit eutils multiprocessing toolchain-funcs - -DESCRIPTION="EDK II Open Source UEFI Firmware" -HOMEPAGE="https://github.com/tianocore/tianocore.github.io/wiki/EDK-II" - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug +qemu +secure-boot" - -if [[ ${PV} == 99999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/tianocore/edk2.git" - KEYWORDS="-* ~arm64 ~amd64" -else - EDK2_PV="vUDK2017" - S="${WORKDIR}/edk2-${EDK2_PV}" - SRC_URI="https://github.com/tianocore/edk2/archive/${EDK2_PV}.tar.gz" - KEYWORDS="-* arm64 amd64" -fi - -OPENSSL_PV="1.1.0f" -OPENSSL_P="openssl-${OPENSSL_PV}" -SRC_URI+=" https://www.openssl.org/source/${OPENSSL_P}.tar.gz" - -DEPEND=" - amd64? ( - >=dev-lang/nasm-2.10.0 - sys-power/iasl - )" - -RDEPEND=" - !sys-firmware/edk2-armvirt - !sys-firmware/edk2-ovmf - " - -src_unpack() { - [[ ${EGIT_REPO_URI} ]] && git-r3_src_unpack - unpack ${A} -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-2017.06-edksetup.patch" - epatch "${FILESDIR}/${PN}-2017.06-BaseTools.patch" - - if use secure-boot; then - local openssllib="${S}/CryptoPkg/Library/OpensslLib" - mv "${WORKDIR}/${OPENSSL_P}" "${openssllib}/openssl" || \ - die "openssl setup failed." - fi -} - -src_configure() { - ./edksetup.sh || die "edksetup.sh failed." - - TARGET_NAME=$(usex debug DEBUG RELEASE) - TARGET_TOOLS="GCC$(gcc-version | tr -d .)" - [[ $TARGET_TOOLS == GCC[5-9]* ]] && TARGET_TOOLS=GCC5 - - case ${ARCH} in - amd64) TARGET_ARCH=X64 ;; - arm64) TARGET_ARCH=AARCH64 ;; - *) die "Unsupported ${ARCH}" ;; - esac -} - -src_compile() { - # The BaseTools makefile has a conflicting ARCH variable. - local arch_save=${ARCH} - unset ARCH - emake -C BaseTools -j1 - ARCH=${arch_save} - - export "${TARGET_TOOLS}_AARCH64_PREFIX=${CHOST}-" - source ./edksetup.sh || die "edksetup.sh failed." - - case ${ARCH} in - amd64) - ./OvmfPkg/build.sh \ - -a "${TARGET_ARCH}" \ - -b "${TARGET_NAME}" \ - -t "${TARGET_TOOLS}" \ - -n $(makeopts_jobs) \ - -D SECURE_BOOT_ENABLE=$(usex secure-boot TRUE FALSE) \ - -D FD_SIZE_2MB \ - || die "edk2 build failed." - ;; - arm64) - build \ - -a ${TARGET_ARCH} \ - -b ${TARGET_NAME} \ - -p ArmVirtPkg/ArmVirtQemu.dsc \ - -t ${TARGET_TOOLS} \ - -n $(makeopts_jobs) \ - -D SECURE_BOOT_ENABLE=$(usex secure-boot TRUE FALSE) \ - -D FD_SIZE_2MB \ - || die "edk2 build failed." - ;; - *) - die "Unsupported ${ARCH}" - ;; - esac -} - -src_install() { - insinto /usr/share/${PN} - - case ${ARCH} in - amd64) - local fv="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV" - doins "${fv}"/OVMF{,_CODE,_VARS}.fd - dosym OVMF.fd /usr/share/${PN}/bios.bin - - if use qemu; then - dosym ../${PN}/OVMF.fd /usr/share/qemu/efi-bios.bin - fi - ;; - arm64) - local fv="Build/ArmVirtQemu-${TARGET_ARCH}/${TARGET_NAME}_${TARGET_TOOLS}/FV" - doins "${fv}"/QEMU_EFI.fd - dosym QEMU_EFI.fd /usr/share/${PN}/bios.bin - ;; - esac -} - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-BaseTools.patch b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-BaseTools.patch deleted file mode 100644 index 64c695ef53..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-BaseTools.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 7a17214744ad7fdeee181d454618b0ceabd4f51c -Author: Geoff Levand -Date: Wed Jul 26 17:52:24 2017 -0700 - - Fix BaseTools makefiles for pie compiler - - Signed-off-by: Geoff Levand - -diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 063982b82f..693e08b942 100644 ---- a/BaseTools/Source/C/Makefiles/header.makefile -+++ b/BaseTools/Source/C/Makefiles/header.makefile -@@ -51,7 +51,7 @@ BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-depreca - else - BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g - endif --BUILD_LFLAGS = -+BUILD_LFLAGS = -no-pie - BUILD_CXXFLAGS = -Wno-unused-result - - ifeq ($(ARCH), IA32) -diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile -index 2ebf3e0465..b81f51ecd7 100644 ---- a/BaseTools/Source/C/VfrCompile/GNUmakefile -+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile -@@ -36,6 +36,8 @@ include $(MAKEROOT)/Makefiles/header.makefile - - APPLICATION = $(MAKEROOT)/bin/$(APPNAME) - -+LFLAGS = -no-pie -+ - .PHONY:all - all: $(MAKEROOT)/bin $(APPLICATION) - -diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile -index 8f2cc78c59..5bac6f9e5d 100644 ---- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile -+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile -@@ -170,7 +170,7 @@ ANTLR=${BIN_DIR}/antlr - DLG=${BIN_DIR}/dlg - OBJ_EXT=o - OUT_OBJ = -o --BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 -+BUILD_CFLAGS= -no-pie $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 - BUILD_CPPFLAGS= - # - # SGI Users, use this CFLAGS -diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile -index b3a34d3b46..1676ee7761 100644 ---- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile -+++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile -@@ -118,7 +118,7 @@ BUILD_CC?=cc - COPT=-O - ANTLR=${BIN_DIR}/antlr - DLG=${BIN_DIR}/dlg --BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 -+BUILD_CFLAGS= -no-pie $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 - BUILD_CPPFLAGS= - OBJ_EXT=o - OUT_OBJ = -o diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-edksetup.patch b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-edksetup.patch deleted file mode 100644 index d6ec516cc7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-edksetup.patch +++ /dev/null @@ -1,17 +0,0 @@ -commit cc3c0e45b929927ed49b16e0edddebbd2da05f74 -Author: Geoff Levand -Date: Thu Jul 20 16:26:08 2017 -0700 - - fix edksetup.sh - - Signed-off-by: Geoff Levand - -diff --git a/edksetup.sh b/edksetup.sh -index ec54f9ea40..fb0213bd1b 100755 ---- a/edksetup.sh -+++ b/edksetup.sh -@@ -146,4 +146,3 @@ SourceEnv - - unset SCRIPTNAME RECONFIG - --return $? diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - From 58c4ce375d23f2b4cf7cff8ba152a4fb46984b8f Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 17:31:14 +0000 Subject: [PATCH 14/22] app-emulation/qemu: Switch edk2 back to edk2-ovmf --- .../qemu/{qemu-2.11.1-r2.ebuild => qemu-2.11.1-r3.ebuild} | 2 +- .../app-emulation/{qemu-2.11.1-r2 => qemu-2.11.1-r3} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/{qemu-2.11.1-r2.ebuild => qemu-2.11.1-r3.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{qemu-2.11.1-r2 => qemu-2.11.1-r3} (63%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-2.11.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-2.11.1-r3.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-2.11.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-2.11.1-r3.ebuild index 766846a3be..d2009f0438 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-2.11.1-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-2.11.1-r3.ebuild @@ -162,7 +162,7 @@ X86_FIRMWARE_DEPEND=" ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( - sys-firmware/edk2 + sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/qemu-2.11.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/qemu-2.11.1-r3 similarity index 63% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/qemu-2.11.1-r2 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/qemu-2.11.1-r3 index f3bc3852be..cb8ed74921 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/qemu-2.11.1-r2 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/qemu-2.11.1-r3 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure info install postinst prepare pretend setup test -DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2 sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2 sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap ) +DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap ) DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools EAPI=6 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 +filecaps KEYWORDS=amd64 arm64 ~ppc ~ppc64 x86 ~x86-fbsd LICENSE=GPL-2 LGPL-2 BSD-2 -RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2 sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2 sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu ) +RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu ) REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk ) SLOT=0 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.11.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.11.1-patches-r1.tar.xz _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 55aaa148741116aa54ad0d80e361818e l10n 97f2753e3f1f3753d53d856c7c0bbb0b linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=e50112842f681d7e08121bf6d274939a +_md5_=de85c53a43dab723c22f33d5131dd0b1 From 9dcb234b736c745d6dc2628501fb78dbb8dff2d2 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 17:32:43 +0000 Subject: [PATCH 15/22] coreos-devel/sdk-depends: Switch edk2 back to edk2-ovmf --- ...epends-0.0.1-r37.ebuild => sdk-depends-0.0.1-r38.ebuild} | 0 .../coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild | 2 +- .../metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 | 6 +++--- .../{sdk-depends-0.0.1-r37 => sdk-depends-0.0.1-r38} | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/{sdk-depends-0.0.1-r37.ebuild => sdk-depends-0.0.1-r38.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/{sdk-depends-0.0.1-r37 => sdk-depends-0.0.1-r38} (77%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r37.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r38.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r37.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r38.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index c52e4e65af..d79bd4166e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -43,7 +43,7 @@ DEPEND=" sys-apps/seismograph sys-boot/grub sys-boot/shim - sys-firmware/edk2 + sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup " diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 index 903a7bfd6d..8b67cc31a2 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 @@ -1,10 +1,10 @@ DEFINED_PHASES=- -DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 +DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 DESCRIPTION=Meta ebuild for everything that needs to be in the SDK. EAPI=5 HOMEPAGE=http://coreos.com/docs/sdk/ KEYWORDS=amd64 LICENSE=GPL-2 -RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 +RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 SLOT=0 -_md5_=0e7604f9f7c86a9f4a697d1bb78b74b1 +_md5_=7dc10130487f1d62138dda1b66a1cf06 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r37 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r38 similarity index 77% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r37 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r38 index 903a7bfd6d..8b67cc31a2 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r37 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r38 @@ -1,10 +1,10 @@ DEFINED_PHASES=- -DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 +DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 DESCRIPTION=Meta ebuild for everything that needs to be in the SDK. EAPI=5 HOMEPAGE=http://coreos.com/docs/sdk/ KEYWORDS=amd64 LICENSE=GPL-2 -RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 +RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 SLOT=0 -_md5_=0e7604f9f7c86a9f4a697d1bb78b74b1 +_md5_=7dc10130487f1d62138dda1b66a1cf06 From 41093363e75ccf1f5a9efea5361a2f998b305ab7 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 17:34:26 +0000 Subject: [PATCH 16/22] profiles: Build edk2-ovmf firmware from source --- .../coreos-overlay/profiles/coreos/base/package.use | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index abfbf871aa..824ab38268 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -95,3 +95,6 @@ net-misc/socat -ssl # Prevent pulling in a ton of perl dependencies sys-apps/man-db -nls + +# Always build the firmware from source. +sys-firmware/edk2-ovmf -binary From 72c4e2ce94d6407f6581413e077d18abd53fbeda Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 17:48:22 +0000 Subject: [PATCH 17/22] app-crypt/efitools: Move back to portage-stable --- .../app-crypt/efitools/Manifest | 1 - .../efitools/efitools-1.5.3_p20150420.ebuild | 23 ------------------- .../app-crypt/efitools/metadata.xml | 8 ------- .../app-crypt/efitools-1.5.3_p20150420 | 11 --------- 4 files changed, 43 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/efitools-1.5.3_p20150420.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/efitools-1.5.3_p20150420 diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/Manifest b/sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/Manifest deleted file mode 100644 index df40499d40..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST efitools-1.5.3_p20150420.tar.gz 111824 SHA256 04894265bab22df1046af7c4e4877edf282b3de290026afc85298f5cdb683e88 SHA512 d0b6093812afb3b4e89860707e926063b826185b843dd75f6e9dd399ff7af4f605c75c6526a259599e6f572bd72d7c3731b1030ccd10c5319944d18b767d07cd WHIRLPOOL 95af23e46c0867ebd60cf721a3addef4357c9f8b861c197a25ee2f5f97b4bdd8a424270b56ea0791db9612c6344857736b09a173932ec90f253cb74094f27cd1 diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/efitools-1.5.3_p20150420.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/efitools-1.5.3_p20150420.ebuild deleted file mode 100644 index afa3423f46..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/efitools-1.5.3_p20150420.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Copyright 2015 CoreOS, Inc -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -DESCRIPTION="Tools for manipulating UEFI secure boot platforms" -HOMEPAGE="git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git" -SRC_URI="http://storage.core-os.net/mirror/snapshots/efitools-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-libs/openssl - sys-apps/util-linux" -DEPEND="${RDEPEND} - sys-apps/help2man - sys-boot/gnu-efi - app-crypt/sbsigntool - virtual/pkgconfig - dev-perl/File-Slurp" diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/metadata.xml deleted file mode 100644 index 6b2229b74c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/efitools/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - gregkh@gentoo.org - do whatever - - diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/efitools-1.5.3_p20150420 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/efitools-1.5.3_p20150420 deleted file mode 100644 index 0a9f1bb154..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/efitools-1.5.3_p20150420 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=- -DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi app-crypt/sbsigntool virtual/pkgconfig dev-perl/File-Slurp -DESCRIPTION=Tools for manipulating UEFI secure boot platforms -EAPI=4 -HOMEPAGE=git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=dev-libs/openssl sys-apps/util-linux -SLOT=0 -SRC_URI=http://storage.core-os.net/mirror/snapshots/efitools-1.5.3_p20150420.tar.gz -_md5_=c5819890b59635f6c1a1e13f6c32fbe5 From b23b3ccc9cd1fdc1921122e4d626477c1b6ccdd8 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 18:07:46 +0000 Subject: [PATCH 18/22] app-crypt/sbsigntool: Move back to portage-stable (as sbsigntools) --- .../app-crypt/sbsigntool/ChangeLog | 33 -- .../app-crypt/sbsigntool/Manifest | 27 -- ...001-Support-openssl-1.0.2b-and-above.patch | 29 -- .../Align-signature-data-to-8-bytes.patch | 26 -- .../files/add_corrected_efivars_magic.patch | 23 -- .../sbsigntool/files/arm-arm64-support.patch | 50 --- .../files/del-duplicate-define.patch | 20 -- .../sbsigntool/files/efi_arch_ia32.patch | 50 --- .../files/fix-signature-padding.patch | 24 -- .../files/ignore-certificate-expiries.patch | 25 -- .../sbsigntool/files/update_checksums.patch | 327 ------------------ .../files/zero-sized-sections.patch | 81 ----- .../app-crypt/sbsigntool/metadata.xml | 8 - .../sbsigntool/sbsigntool-0.6-r3.ebuild | 46 --- .../md5-cache/app-crypt/sbsigntool-0.6-r3 | 12 - 15 files changed, 781 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/ChangeLog delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/0001-Support-openssl-1.0.2b-and-above.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/Align-signature-data-to-8-bytes.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/add_corrected_efivars_magic.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/arm-arm64-support.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/del-duplicate-define.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/efi_arch_ia32.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/fix-signature-padding.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/ignore-certificate-expiries.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/update_checksums.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/zero-sized-sections.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/sbsigntool-0.6-r3.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/sbsigntool-0.6-r3 diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/ChangeLog b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/ChangeLog deleted file mode 100644 index d2e116e052..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/ChangeLog +++ /dev/null @@ -1,33 +0,0 @@ -# ChangeLog for app-crypt/sbsigntool -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/sbsigntool/ChangeLog,v 1.7 2014/01/14 13:55:54 ago Exp $ - - 14 Jan 2014; Agostino Sarubbo sbsigntool-0.6-r1.ebuild: - Stable for x86, wrt bug #495328 - - 12 Jan 2014; Pacho Ramos sbsigntool-0.6-r1.ebuild: - amd64 stable, bug #495328 - -*sbsigntool-0.6-r1 (03 Oct 2013) - - 03 Oct 2013; Greg Kroah-Hartman - +files/0002-image.c-clear-image-variable.patch, - +files/0003-Fix-for-multi-sign.patch, +sbsigntool-0.6-r1.ebuild: - patches to fix multi-key signing, fixing bugs with new versions of UEFI - firmware. Taken from the openSUSE packages as the upstream Launchpad project - is now dead. - - 05 Sep 2013; Mike Frysinger sbsigntool-0.6.ebuild: - Fix $AR handling #481480 by Agostino Sarubbo. - - 28 Aug 2013; Agostino Sarubbo sbsigntool-0.6.ebuild: - Stable for x86, wrt bug #481396 - - 17 Aug 2013; Agostino Sarubbo sbsigntool-0.6.ebuild: - Stable for amd64, wrt bug #481396 - -*sbsigntool-0.6 (24 Dec 2012) - - 24 Dec 2012; Mike Frysinger +metadata.xml, - +sbsigntool-0.6.ebuild: - New package #444830 by Maxim Kammerer. diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/Manifest b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/Manifest deleted file mode 100644 index 27e0890209..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/Manifest +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX 0002-image.c-clear-image-variable.patch 822 SHA256 7877d69c0a6d014f43e1dc922db3fb503c1c3176dd2665a96f85ddfd73ed7e12 SHA512 004ba118cbe8fe5cc291888966e5994373c0b9d8149bc5c652a72971138fab5e64d721061c69e8b864d6ca5cdb4ffa193520156941b6bd9c998b256f8d72697b WHIRLPOOL 3872d97cde83e9423622f348dc50eb414f8512f95673cbf7e4b908f699455003d57711bda6bd0893f3a21b876a66ec480416bed5df52e5ecb33c00b21cbbb6c9 -AUX 0003-Fix-for-multi-sign.patch 1452 SHA256 803f97f6c01a573367371f9ffd4c53aab5916ea3218fdc515429ca559f5dad31 SHA512 2aba55a116536e7f41e4aac2fd33eeb92cf89b14bcdd8b93b6e9dc9bdaf2f0162134e56f7d365640445bf801ad8590f6d49f14cdf80b791324647067d52ae435 WHIRLPOOL a83c8dde50cf82559408be58482f73aa1c3460a63424578decfc36033b5c368f8ad219b1412a7eb0a478e91b8654e7a7392dc886a496f9efea6f12dcd2f0e379 -DIST sbsigntool_0.6.orig.tar.gz 212375 SHA256 84fb0c8f6fb1e79aa418a4f70a3139b38d5630043b28291c875f383e9b4294b8 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c WHIRLPOOL 3b86b9861f5e26586e8a9eb9bbf48adf1a12714b294f0acd605d53e37c27192006c6ecc81d31bf4f200f8e88508f38a52ef93e9e01e301c4245a11894227cecc -EBUILD sbsigntool-0.6-r1.ebuild 1151 SHA256 639b4edebf714b1c12eafce03c53961fda89e3488b3bcd0d483c100fb0459b70 SHA512 4ceb4e52b9bedbd1c8e548b3b27a7360f1ca8a0e4dda647897d0a7b19f475ccce696ca92db1bd34a9202af5b5b8091447bfcc1d8213849fdabaa1f13ed0c7bfd WHIRLPOOL 1cc2fd6a4eadc7c6de4d39115e7f5195302a78be3ab672e2b1895a93f91167a081f43aa74d0774328b334f21f119b556241eff449a823fa36a71f813fd408f8b -EBUILD sbsigntool-0.6.ebuild 1030 SHA256 8bc44c1f02f282908aa16e638f3d950a270b3997906055bb4d5b24b1f249bace SHA512 40f1746f5e87f8f5fda0fccd3907ee62aab3f6c0268c9cc474b2182f367cf0d28d05bfec7569a73c72c71dc7071e942a3841cac2f4dde671664cef72053ab2ff WHIRLPOOL e25a70fbadd8cded0c5daa1a28a0518bd3c13d4f182498a7c784fed88bc0972dd54a03fe4fe243eef4fdd9a1f21d3f66a9f93597a097a224f1d00ecde938cc1c -MISC ChangeLog 1296 SHA256 e43b8ad6d0b157b04ce9d2aedbc27ace4e2d7b1d74203e431700227e6301ea74 SHA512 8e365b7d6858a39baf2bfe5f4c5f8ed48587c004801e52c1406adaef0382de780008773538954f96033c8e4e3c77cccab970f6b3c3846f0fdc7f514dfa51529a WHIRLPOOL 7bdc2c38f447adef46eb0967fb264b067b8be8c1c2423807c0549cb5d796877998aff404afebb470dfa2dcfd2bec8a30f1d25f53fda9dd22c0f4d68e273f41e8 -MISC metadata.xml 240 SHA256 060d4d570194ff567e10d66246f85d4b9fee1efb17d111aeb9f03345f6e20efd SHA512 41a5c4b9e67d814937a0524714617a059c1351a00ac12d9344373f43b41d074e24fab5598e44c8a22f1848bfa12b8fc76cd5674ca62cd1f917b3235c77721971 WHIRLPOOL da0b560d9528cfe4fcff409de2d9749cf9ae8b7a04468b42463e8097b89e152a67a0da0ea7e6db1186f852687979c2e843e487a5eb76e663717148a796aa093d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAEBCAAGBQJS1UHrAAoJELp701BxlEWfYJMP/25zmGEaSRVtpesZ2OhvUSfp -G+GlDZxKHCK6yq+/eOpRkm8zKnr3RomNiCN91RNYXmkmueO+FGt+Rs8r5GirVd03 -iraLslXIzlT79oft6OKdOPVKmWxtVBpdIyUJRR159J86hV5VLWHSeOLqOCN30Uhl -JBk85iim/3/cGoJhNGrPQG/2Uv+r+90sS/kzjrpWvM7WCeY3GvOF6b4asRQf1hqI -kbTpZtIN5t5eJb1wPXDq1MRL7upQutMCajZL5FYoYJvy5J693ZWLK2nV2ueipBAS -a0iPd8ZWxYuc8jQlYu/DyscD+wZeoQ56bhmRzwS/3ukipBrGgUuffAcehFumGOhG -MtZ4iCUpoBityyA/JqXmZGyLqF5JnvfGB1C7BmnW9HeMZkQ6PFFnZnft/q2c9S0x -cS9uzgUBOLBwfbvaqRPv5iiR7w4aXjDoMZvceSgUfFwxLG5puwb+cOTyK6EybNRB -hj+OcnqdYN9mVbNxkI4ynFcODXhtaD/di2zgG42G713iJzlXZa5DvfbaB/pRF+yy -hJ65o3njE+1mdlsq5zLAAfRBOM/PvtUz2X8gqKgyph5rqebeXxDbbn9dOb7WKFTW -7udikXc767F6QIEuM/1kd63q2pw1JbnbPN9mqEY8KqUcpsmPKdBeM4wzfaUuJ22D -O7CfSgXtIT0edtHNtU6L -=sTMV ------END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/0001-Support-openssl-1.0.2b-and-above.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/0001-Support-openssl-1.0.2b-and-above.patch deleted file mode 100644 index ec75501948..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/0001-Support-openssl-1.0.2b-and-above.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3186e24f5a46172cd771d61cdeec5e590f73743e Mon Sep 17 00:00:00 2001 -From: Steve Langasek -Date: Wed, 15 Jul 2015 08:48:25 -0700 -Subject: [PATCH] Support openssl 1.0.2b and above - -Newer versions of openssl return a different error with alternate -certificate chains; update for compatibility. - -Signed-off-by: Marc Deslauriers -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1474541 ---- - src/sbverify.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/sbverify.c b/src/sbverify.c -index fb03d21..35890b9 100644 ---- a/src/sbverify.c -+++ b/src/sbverify.c -@@ -201,6 +201,7 @@ static int x509_verify_cb(int status, X509_STORE_CTX *ctx) - - /* all certs given with the --cert argument are trusted */ - else if (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY || -+ err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT || - err == X509_V_ERR_CERT_UNTRUSTED) { - - if (cert_in_store(ctx->current_cert, ctx)) --- -2.1.4 - diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/Align-signature-data-to-8-bytes.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/Align-signature-data-to-8-bytes.patch deleted file mode 100644 index accd832ce7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/Align-signature-data-to-8-bytes.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8b6b7a9904881757254b92a928b95dfb8634605b Mon Sep 17 00:00:00 2001 -From: Steve Langasek -Date: Fri, 12 Oct 2012 16:27:13 -0700 -Subject: [PATCH] Align signature data to 8 bytes - -Before appending the signature data to our binary, pad the file out to -8-byte alignment. This matches the Microsoft signing implementation, which -enables us to use sbattach to verify the integrity of the binaries returned -by the SysDev signing service. ---- - src/image.c | 2 ++ - 1 file changed, 2 insertions(+) - -Index: sbsigntool-0.6/src/image.c -=================================================================== ---- sbsigntool-0.6.orig/src/image.c -+++ sbsigntool-0.6/src/image.c -@@ -425,6 +425,8 @@ - * we've calculated during the pecoff parsing, so we need to redo that - * too. - */ -+ image->data_size = align_up(image->data_size, 8); -+ - if (image->data_size > image->size) { - image->buf = talloc_realloc(image, image->buf, uint8_t, - image->data_size); diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/add_corrected_efivars_magic.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/add_corrected_efivars_magic.patch deleted file mode 100644 index 8973227328..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/add_corrected_efivars_magic.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: sbsigntool/src/sbkeysync.c -=================================================================== ---- sbsigntool.orig/src/sbkeysync.c 2013-12-03 15:45:49.007312000 +0100 -+++ sbsigntool/src/sbkeysync.c 2013-12-03 15:47:47.396135699 +0100 -@@ -56,7 +56,8 @@ - #include "efivars.h" - - #define EFIVARS_MOUNTPOINT "/sys/firmware/efi/efivars" --#define EFIVARS_FSTYPE 0x6165676C -+#define PSTORE_FSTYPE 0x6165676C -+#define EFIVARS_FSTYPE 0xde5e81e4 - - #define EFI_IMAGE_SECURITY_DATABASE_GUID \ - { 0xd719b2cb, 0x3d3a, 0x4596, \ -@@ -533,7 +534,7 @@ - if (rc) - return -1; - -- if (statbuf.f_type != EFIVARS_FSTYPE) -+ if (statbuf.f_type != EFIVARS_FSTYPE && statbuf.f_type != PSTORE_FSTYPE) - return -1; - - return 0; diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/arm-arm64-support.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/arm-arm64-support.patch deleted file mode 100644 index 6a137c4f27..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/arm-arm64-support.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit a3413e76f95472639d1b25f0564105d8bb4e2837 -Author: Ard Biesheuvel -Date: Tue Nov 19 09:25:32 2013 +0100 - - sbsigntool: add support for ARM and Aarch64 PE/COFF images - - Note that for the ARM case, we are using IMAGE_FILE_MACHINE_THUMB (0x1c2) - rather than IMAGE_FILE_MACHINE_ARM (0x1c0), as the latter refers to - an older calling convention that is incompatible with Tianocore UEFI. - - Signed-off-by: Ard Biesheuvel - -diff --git a/src/coff/pe.h b/src/coff/pe.h -index 3a43174..0d1036e 100644 ---- a/src/coff/pe.h -+++ b/src/coff/pe.h -@@ -151,6 +151,7 @@ - #define IMAGE_FILE_MACHINE_THUMB 0x01c2 - #define IMAGE_FILE_MACHINE_TRICORE 0x0520 - #define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169 -+#define IMAGE_FILE_MACHINE_AARCH64 0xaa64 - - #define IMAGE_SUBSYSTEM_UNKNOWN 0 - #define IMAGE_SUBSYSTEM_NATIVE 1 -diff --git a/src/image.c b/src/image.c -index c30d6e3..d6e3c48 100644 ---- a/src/image.c -+++ b/src/image.c -@@ -232,13 +232,16 @@ static int image_pecoff_parse(struct image *image) - image->opthdr.addr = image->pehdr + 1; - magic = pehdr_u16(image->pehdr->f_magic); - -- if (magic == IMAGE_FILE_MACHINE_AMD64) { -+ switch (magic) { -+ case IMAGE_FILE_MACHINE_AMD64: -+ case IMAGE_FILE_MACHINE_AARCH64: - rc = image_pecoff_parse_64(image); -- -- } else if (magic == IMAGE_FILE_MACHINE_I386) { -+ break; -+ case IMAGE_FILE_MACHINE_I386: -+ case IMAGE_FILE_MACHINE_THUMB: - rc = image_pecoff_parse_32(image); -- -- } else { -+ break; -+ default: - fprintf(stderr, "Invalid PE header magic\n"); - return -1; - } diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/del-duplicate-define.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/del-duplicate-define.patch deleted file mode 100644 index 23c8c0e312..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/del-duplicate-define.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit f09bf94b29cf050e7c489d8bd771b4392b3111ea -Author: Ard Biesheuvel -Date: Tue Nov 19 09:23:31 2013 +0100 - - sbsigntool: remove doubly defined IMAGE_FILE_MACHINE_AMD64 - - Signed-off-by: Ard Biesheuvel - -diff --git a/src/coff/pe.h b/src/coff/pe.h -index 601a68e..3a43174 100644 ---- a/src/coff/pe.h -+++ b/src/coff/pe.h -@@ -151,7 +151,6 @@ - #define IMAGE_FILE_MACHINE_THUMB 0x01c2 - #define IMAGE_FILE_MACHINE_TRICORE 0x0520 - #define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169 --#define IMAGE_FILE_MACHINE_AMD64 0x8664 - - #define IMAGE_SUBSYSTEM_UNKNOWN 0 - #define IMAGE_SUBSYSTEM_NATIVE 1 diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/efi_arch_ia32.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/efi_arch_ia32.patch deleted file mode 100644 index e07f50d247..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/efi_arch_ia32.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ffbf59032c9dff0afc19490f012066d4bbd5a0c3 Mon Sep 17 00:00:00 2001 -From: Steve Langasek -Date: Fri, 12 Oct 2012 16:48:53 -0700 -Subject: [PATCH] Use AC_CANONICAL_HOST, not uname -m, to determine target - -The EFI architecture should be set from the standard autoconf macros, not -from uname -m. Uname -m is wrong not just when cross-building, but also when -running 32-bit userspace on a 64-bit kernel. - -Ref: https://bugs.launchpad.net/bugs/1066038 ---- - configure.ac | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0d8f0bb..a693d96 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,6 +7,8 @@ AC_PREREQ(2.60) - AC_CONFIG_HEADERS(config.h) - AC_CONFIG_SRCDIR(src/sbsign.c) - -+AC_CANONICAL_HOST -+ - AM_PROG_AS - AC_PROG_CC - AM_PROG_CC_C_O -@@ -64,7 +66,18 @@ PKG_CHECK_MODULES(uuid, uuid, - AC_MSG_ERROR([libuuid (from the uuid package) is required])) - - dnl gnu-efi headers require extra include dirs --EFI_ARCH=$(uname -m) -+case $host_cpu in -+ x86_64) -+ EFI_ARCH=$host_cpu -+ ;; -+ i*86) -+ EFI_ARCH=ia32 -+ ;; -+ *) -+ AC_MSG_ERROR([unsupported EFI architecture $host_cpu]) -+ ;; -+esac -+ - EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \ - -DEFI_FUNCTION_WRAPPER" - CPPFLAGS_save="$CPPFLAGS" --- -1.7.10.4 - diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/fix-signature-padding.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/fix-signature-padding.patch deleted file mode 100644 index 5028cd4c86..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/fix-signature-padding.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: fix calculation of the size of our signature data - The 'size' field of the certificate table header includes the size of the - header itself. When parsing a signed file, we should therefore subtract the - size of this header from the field representing the size of the pkcs7 data - packet; otherwise when we detach (and subsequently reattach) a signature, - we wind up with 8 extra bytes of zeroes at the end each time. Fixing this - ensures that detaching and signature and then reattaching it to the file - gives us back the original file. -Author: Steve Langasek -Last-Update: 2013-09-07 - -Index: sbsigntool-0.6/src/image.c -=================================================================== ---- sbsigntool-0.6.orig/src/image.c -+++ sbsigntool-0.6/src/image.c -@@ -285,7 +285,7 @@ - if (cert_table && cert_table->revision == CERT_TABLE_REVISION && - cert_table->type == CERT_TABLE_TYPE_PKCS && - cert_table->size < size) { -- image->sigsize = cert_table->size; -+ image->sigsize = cert_table->size - sizeof(*cert_table); - image->sigbuf = talloc_memdup(image, cert_table + 1, - image->sigsize); - } diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/ignore-certificate-expiries.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/ignore-certificate-expiries.patch deleted file mode 100644 index b27e0cbeb4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/ignore-certificate-expiries.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: ignore certificate expiries when verifying signatures - The UEFI implementation explicitly ignores all errors due to expired (or - not yet valid) signatures. Ensure that sbverify behaves compatibly. -Author: Steve Langasek -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1234649. -Last-Update: 2013-10-03 - -Index: sbsigntool-0.6/src/sbverify.c -=================================================================== ---- sbsigntool-0.6.orig/src/sbverify.c -+++ sbsigntool-0.6/src/sbverify.c -@@ -206,6 +206,13 @@ - if (cert_in_store(ctx->current_cert, ctx)) - status = 1; - } -+ /* UEFI doesn't care about expired signatures, so we shouldn't either. */ -+ else if (err == X509_V_ERR_CERT_HAS_EXPIRED || -+ err == X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD || -+ err == X509_V_ERR_CERT_NOT_YET_VALID || -+ err == X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD) { -+ status = 1; -+ } - - return status; - } diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/update_checksums.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/update_checksums.patch deleted file mode 100644 index 3ffdd503b9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/update_checksums.patch +++ /dev/null @@ -1,327 +0,0 @@ -From: Steve Langasek - -Update the PE checksum field using the somewhat-underdocumented -algorithm, so that we match the Microsoft implementation in our -signature generation. - -Signed-off-by: Jeremy Kerr - ---- - autogen.sh | 2 - - src/image.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 60 insertions(+), 1 deletion(-) - -Index: sbsigntool-0.6/src/image.c -=================================================================== ---- sbsigntool-0.6.orig/src/image.c -+++ sbsigntool-0.6/src/image.c -@@ -38,6 +38,7 @@ - #include - #include - -+#include - #include - #include - #include -@@ -129,6 +130,62 @@ - return 0; - } - -+static uint16_t csum_update_fold(uint16_t csum, uint16_t x) -+{ -+ uint32_t new = csum + x; -+ new = (new >> 16) + (new & 0xffff); -+ return new; -+} -+ -+static uint16_t csum_bytes(uint16_t checksum, void *buf, size_t len) -+{ -+ unsigned int i; -+ uint16_t *p; -+ -+ for (i = 0; i < len; i += sizeof(*p)) { -+ p = buf + i; -+ checksum = csum_update_fold(checksum, *p); -+ } -+ -+ return checksum; -+} -+ -+static void image_pecoff_update_checksum(struct image *image, -+ struct cert_table_header *cert_table) -+{ -+ bool is_signed = image->sigsize && image->sigbuf; -+ uint32_t checksum; -+ -+ /* We carefully only include the signature data in the checksum (and -+ * in the file length) if we're outputting the signature. Otherwise, -+ * in case of signature removal, the signature data is in the buffer -+ * we read in (as indicated by image->size), but we do *not* want to -+ * checksum it. -+ * -+ * We also skip the 32-bits of checksum data in the PE/COFF header. -+ */ -+ checksum = csum_bytes(0, image->buf, -+ (void *)image->checksum - (void *)image->buf); -+ checksum = csum_bytes(checksum, -+ image->checksum + 1, -+ (void *)(image->buf + image->data_size) - -+ (void *)(image->checksum + 1)); -+ -+ if (is_signed) { -+ checksum = csum_bytes(checksum, -+ cert_table, sizeof(*cert_table)); -+ -+ checksum = csum_bytes(checksum, image->sigbuf, image->sigsize); -+ } -+ -+ checksum += image->data_size; -+ -+ if (is_signed) -+ checksum += sizeof(*cert_table) + image->sigsize; -+ -+ *(image->checksum) = cpu_to_le32(checksum); -+} -+ - static int image_pecoff_parse(struct image *image) - { - struct cert_table_header *cert_table; -@@ -524,6 +581,8 @@ - image->data_dir_sigtable->size = 0; - } - -+ image_pecoff_update_checksum(image, &cert_table_header); -+ - fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644); - if (fd < 0) { - perror("open"); ---- /dev/null -+++ sbsigntool-0.6/lib/ccan/ccan/endian/endian.h -@@ -0,0 +1,227 @@ -+/* Licensed under LGPLv2.1+ - see LICENSE file for details */ -+#ifndef CCAN_ENDIAN_H -+#define CCAN_ENDIAN_H -+#include -+#include "config.h" -+ -+#if HAVE_BYTESWAP_H -+#include -+#else -+/** -+ * bswap_16 - reverse bytes in a uint16_t value. -+ * @val: value whose bytes to swap. -+ * -+ * Example: -+ * // Output contains "1024 is 4 as two bytes reversed" -+ * printf("1024 is %u as two bytes reversed\n", bswap_16(1024)); -+ */ -+static inline uint16_t bswap_16(uint16_t val) -+{ -+ return ((val & (uint16_t)0x00ffU) << 8) -+ | ((val & (uint16_t)0xff00U) >> 8); -+} -+ -+/** -+ * bswap_32 - reverse bytes in a uint32_t value. -+ * @val: value whose bytes to swap. -+ * -+ * Example: -+ * // Output contains "1024 is 262144 as four bytes reversed" -+ * printf("1024 is %u as four bytes reversed\n", bswap_32(1024)); -+ */ -+static inline uint32_t bswap_32(uint32_t val) -+{ -+ return ((val & (uint32_t)0x000000ffUL) << 24) -+ | ((val & (uint32_t)0x0000ff00UL) << 8) -+ | ((val & (uint32_t)0x00ff0000UL) >> 8) -+ | ((val & (uint32_t)0xff000000UL) >> 24); -+} -+#endif /* !HAVE_BYTESWAP_H */ -+ -+#if !HAVE_BSWAP_64 -+/** -+ * bswap_64 - reverse bytes in a uint64_t value. -+ * @val: value whose bytes to swap. -+ * -+ * Example: -+ * // Output contains "1024 is 1125899906842624 as eight bytes reversed" -+ * printf("1024 is %llu as eight bytes reversed\n", -+ * (unsigned long long)bswap_64(1024)); -+ */ -+static inline uint64_t bswap_64(uint64_t val) -+{ -+ return ((val & (uint64_t)0x00000000000000ffULL) << 56) -+ | ((val & (uint64_t)0x000000000000ff00ULL) << 40) -+ | ((val & (uint64_t)0x0000000000ff0000ULL) << 24) -+ | ((val & (uint64_t)0x00000000ff000000ULL) << 8) -+ | ((val & (uint64_t)0x000000ff00000000ULL) >> 8) -+ | ((val & (uint64_t)0x0000ff0000000000ULL) >> 24) -+ | ((val & (uint64_t)0x00ff000000000000ULL) >> 40) -+ | ((val & (uint64_t)0xff00000000000000ULL) >> 56); -+} -+#endif -+ -+/* Sanity check the defines. We don't handle weird endianness. */ -+#if !HAVE_LITTLE_ENDIAN && !HAVE_BIG_ENDIAN -+#error "Unknown endian" -+#elif HAVE_LITTLE_ENDIAN && HAVE_BIG_ENDIAN -+#error "Can't compile for both big and little endian." -+#endif -+ -+/** -+ * cpu_to_le64 - convert a uint64_t value to little-endian -+ * @native: value to convert -+ */ -+static inline uint64_t cpu_to_le64(uint64_t native) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return native; -+#else -+ return bswap_64(native); -+#endif -+} -+ -+/** -+ * cpu_to_le32 - convert a uint32_t value to little-endian -+ * @native: value to convert -+ */ -+static inline uint32_t cpu_to_le32(uint32_t native) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return native; -+#else -+ return bswap_32(native); -+#endif -+} -+ -+/** -+ * cpu_to_le16 - convert a uint16_t value to little-endian -+ * @native: value to convert -+ */ -+static inline uint16_t cpu_to_le16(uint16_t native) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return native; -+#else -+ return bswap_16(native); -+#endif -+} -+ -+/** -+ * le64_to_cpu - convert a little-endian uint64_t value -+ * @le_val: little-endian value to convert -+ */ -+static inline uint64_t le64_to_cpu(uint64_t le_val) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return le_val; -+#else -+ return bswap_64(le_val); -+#endif -+} -+ -+/** -+ * le32_to_cpu - convert a little-endian uint32_t value -+ * @le_val: little-endian value to convert -+ */ -+static inline uint32_t le32_to_cpu(uint32_t le_val) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return le_val; -+#else -+ return bswap_32(le_val); -+#endif -+} -+ -+/** -+ * le16_to_cpu - convert a little-endian uint16_t value -+ * @le_val: little-endian value to convert -+ */ -+static inline uint16_t le16_to_cpu(uint16_t le_val) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return le_val; -+#else -+ return bswap_16(le_val); -+#endif -+} -+ -+/** -+ * cpu_to_be64 - convert a uint64_t value to big endian. -+ * @native: value to convert -+ */ -+static inline uint64_t cpu_to_be64(uint64_t native) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return bswap_64(native); -+#else -+ return native; -+#endif -+} -+ -+/** -+ * cpu_to_be32 - convert a uint32_t value to big endian. -+ * @native: value to convert -+ */ -+static inline uint32_t cpu_to_be32(uint32_t native) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return bswap_32(native); -+#else -+ return native; -+#endif -+} -+ -+/** -+ * cpu_to_be16 - convert a uint16_t value to big endian. -+ * @native: value to convert -+ */ -+static inline uint16_t cpu_to_be16(uint16_t native) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return bswap_16(native); -+#else -+ return native; -+#endif -+} -+ -+/** -+ * be64_to_cpu - convert a big-endian uint64_t value -+ * @be_val: big-endian value to convert -+ */ -+static inline uint64_t be64_to_cpu(uint64_t be_val) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return bswap_64(be_val); -+#else -+ return be_val; -+#endif -+} -+ -+/** -+ * be32_to_cpu - convert a big-endian uint32_t value -+ * @be_val: big-endian value to convert -+ */ -+static inline uint32_t be32_to_cpu(uint32_t be_val) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return bswap_32(be_val); -+#else -+ return be_val; -+#endif -+} -+ -+/** -+ * be16_to_cpu - convert a big-endian uint16_t value -+ * @be_val: big-endian value to convert -+ */ -+static inline uint16_t be16_to_cpu(uint16_t be_val) -+{ -+#if HAVE_LITTLE_ENDIAN -+ return bswap_16(be_val); -+#else -+ return be_val; -+#endif -+} -+ -+#endif /* CCAN_ENDIAN_H */ diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/zero-sized-sections.patch b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/zero-sized-sections.patch deleted file mode 100644 index c9e265b889..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/files/zero-sized-sections.patch +++ /dev/null @@ -1,81 +0,0 @@ -commit 8f596c238f36723c803e45dfb1f6f817e67bc51d -Author: Ard Biesheuvel -Date: Tue Nov 19 09:24:10 2013 +0100 - - sbsigntool: fix handling of zero sized sections - - The loop that iterates over the PE/COFF sections correctly skips zero - sized sections, but still increments the loop index 'i'. This results in - subsequent iterations poking into unallocated memory. - - Signed-off-by: Ard Biesheuvel - -diff --git a/src/image.c b/src/image.c -index a34f117..c30d6e3 100644 ---- a/src/image.c -+++ b/src/image.c -@@ -366,6 +366,7 @@ static int image_find_regions(struct image *image) - /* add COFF sections */ - for (i = 0; i < image->sections; i++) { - uint32_t file_offset, file_size; -+ int n; - - file_offset = pehdr_u32(image->scnhdr[i].s_scnptr); - file_size = pehdr_u32(image->scnhdr[i].s_size); -@@ -373,39 +374,39 @@ static int image_find_regions(struct image *image) - if (!file_size) - continue; - -- image->n_checksum_regions++; -+ n = image->n_checksum_regions++; - image->checksum_regions = talloc_realloc(image, - image->checksum_regions, - struct region, - image->n_checksum_regions); - regions = image->checksum_regions; - -- regions[i + 3].data = buf + file_offset; -- regions[i + 3].size = align_up(file_size, -+ regions[n].data = buf + file_offset; -+ regions[n].size = align_up(file_size, - image->file_alignment); -- regions[i + 3].name = talloc_strndup(image->checksum_regions, -+ regions[n].name = talloc_strndup(image->checksum_regions, - image->scnhdr[i].s_name, 8); -- bytes += regions[i + 3].size; -+ bytes += regions[n].size; - -- if (file_offset + regions[i+3].size > image->size) { -+ if (file_offset + regions[n].size > image->size) { - fprintf(stderr, "warning: file-aligned section %s " - "extends beyond end of file\n", -- regions[i+3].name); -+ regions[n].name); - } - -- if (regions[i+2].data + regions[i+2].size -- != regions[i+3].data) { -+ if (regions[n-1].data + regions[n-1].size -+ != regions[n].data) { - fprintf(stderr, "warning: gap in section table:\n"); - fprintf(stderr, " %-8s: 0x%08tx - 0x%08tx,\n", -- regions[i+2].name, -- regions[i+2].data - buf, -- regions[i+2].data + -- regions[i+2].size - buf); -+ regions[n-1].name, -+ regions[n-1].data - buf, -+ regions[n-1].data + -+ regions[n-1].size - buf); - fprintf(stderr, " %-8s: 0x%08tx - 0x%08tx,\n", -- regions[i+3].name, -- regions[i+3].data - buf, -- regions[i+3].data + -- regions[i+3].size - buf); -+ regions[n].name, -+ regions[n].data - buf, -+ regions[n].data + -+ regions[n].size - buf); - - - gap_warn = 1; diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/metadata.xml deleted file mode 100644 index 0947421cbd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - vapier@gentoo.org - do whatever - - diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/sbsigntool-0.6-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/sbsigntool-0.6-r3.ebuild deleted file mode 100644 index 2d567f927d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntool/sbsigntool-0.6-r3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/sbsigntool/sbsigntool-0.6-r1.ebuild,v 1.3 2014/01/14 13:55:54 ago Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs - -DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot" -HOMEPAGE="https://launchpad.net/ubuntu/+source/sbsigntool" -SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="dev-libs/openssl - sys-apps/util-linux" -DEPEND="${RDEPEND} - sys-apps/help2man - sys-boot/gnu-efi - sys-libs/binutils-libs - virtual/pkgconfig" - -src_prepare() { - local iarch - case ${ARCH} in - ia64) iarch=ia64 ;; - x86) iarch=ia32 ;; - amd64) iarch=x86_64 ;; - *) die "unsupported architecture: ${ARCH}" ;; - esac - sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure || die - sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.in || die - sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480 - epatch "${FILESDIR}"/Align-signature-data-to-8-bytes.patch - epatch "${FILESDIR}"/update_checksums.patch - epatch "${FILESDIR}"/fix-signature-padding.patch - epatch "${FILESDIR}"/ignore-certificate-expiries.patch - epatch "${FILESDIR}"/add_corrected_efivars_magic.patch - epatch "${FILESDIR}"/del-duplicate-define.patch - epatch "${FILESDIR}"/zero-sized-sections.patch - epatch "${FILESDIR}"/arm-arm64-support.patch - epatch "${FILESDIR}"/0001-Support-openssl-1.0.2b-and-above.patch -} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/sbsigntool-0.6-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/sbsigntool-0.6-r3 deleted file mode 100644 index c9782b52b0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/sbsigntool-0.6-r3 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=prepare -DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/binutils-libs virtual/pkgconfig -DESCRIPTION=Utilities for signing and verifying files for UEFI Secure Boot -EAPI=4 -HOMEPAGE=https://launchpad.net/ubuntu/+source/sbsigntool -KEYWORDS=amd64 x86 -LICENSE=GPL-3 -RDEPEND=dev-libs/openssl sys-apps/util-linux -SLOT=0 -SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/sbsigntool_0.6.orig.tar.gz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=29dbea59b5513ac7d26a7a79244fe42f From 4c4ccf1ff8cd61884417e2425b22e00083d454a8 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 18:25:28 +0000 Subject: [PATCH 19/22] app-backup/casync: Drop dead package Gentoo has net-misc/casync now if we ever need this. --- .../coreos-overlay/app-backup/casync/Manifest | 1 - .../app-backup/casync/casync-2.ebuild | 33 ----- .../casync/files/fix-selinux-build.patch | 126 ------------------ .../metadata/md5-cache/app-backup/casync-2 | 13 -- 4 files changed, 173 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-backup/casync/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-backup/casync/casync-2.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-backup/casync/files/fix-selinux-build.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-backup/casync-2 diff --git a/sdk_container/src/third_party/coreos-overlay/app-backup/casync/Manifest b/sdk_container/src/third_party/coreos-overlay/app-backup/casync/Manifest deleted file mode 100644 index 73e632033b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-backup/casync/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST v2.tar.gz 1250776 SHA256 a5f79ee3ccae2df42cce662c36edc7047aebacd3a9c029ee9a859adfa7a68d00 SHA512 d3f27a8af75c07030cbd465bc716f74b1389234ff03c4043f76e898a2c2633ca6352618c89330aca6b83ff8d09082ff7d7a3d835035665c4f9eab9dc643fd3cf WHIRLPOOL 19ecfeac16c2f519a8e2abf4aed65d4331b57e7fbf58386ea0fd0441f58a1306d67103885dd662e5f1e8320add995625687830f4cbdb6535a917979e682b6121 diff --git a/sdk_container/src/third_party/coreos-overlay/app-backup/casync/casync-2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-backup/casync/casync-2.ebuild deleted file mode 100644 index 59dc471417..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-backup/casync/casync-2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="casync - Content-Addressable Data Synchronization Tool - is a tool similar to rsync for backing up and updating directory trees" -HOMEPAGE="https://github.com/systemd/casync" -SRC_URI="https://github.com/systemd/casync/archive/v${PV}.tar.gz" - -inherit meson eutils - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64" -IUSE="fuse selinux doc" - -DEPEND="app-arch/zstd -fuse? ( sys-fs/fuse ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/fix-selinux-build.patch" -) - -src_configure() { - local emesonargs=( - -Dfuse=$(usex fuse true false) - -Dselinux=$(usex selinux true false) - -Dman=$(usex doc true false) - ) - meson_src_configure -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-backup/casync/files/fix-selinux-build.patch b/sdk_container/src/third_party/coreos-overlay/app-backup/casync/files/fix-selinux-build.patch deleted file mode 100644 index d6df24af65..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-backup/casync/files/fix-selinux-build.patch +++ /dev/null @@ -1,126 +0,0 @@ -From ab7ef83b5aef07af6e8628eeab353a3fb043fadd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 26 Jul 2017 09:52:40 -0400 -Subject: [PATCH 1/2] Fix build without selinux and refuse --with=selinux when - compiled without - -Fixes #73. - -The output is pretty crappy: - - $ build/casync --with=selinux make ... - Failed to run synchronizer: Operation not supported - -but that's being tracked as #44. ---- - src/cadecoder.c | 2 +- - src/caencoder.c | 13 ++++++++++--- - 2 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/src/cadecoder.c b/src/cadecoder.c -index 5deca52..aad8e31 100644 ---- a/src/cadecoder.c -+++ b/src/cadecoder.c -@@ -13,7 +13,7 @@ - #include - - #if HAVE_SELINUX --#include -+# include - #endif - - #include "cadecoder.h" -diff --git a/src/caencoder.c b/src/caencoder.c -index eb58bbb..63fd4e2 100644 ---- a/src/caencoder.c -+++ b/src/caencoder.c -@@ -21,7 +21,7 @@ - #include - - #if HAVE_SELINUX --#include -+# include - #endif - - #include "caencoder.h" -@@ -264,10 +264,12 @@ static void ca_encoder_node_free(CaEncoderNode *n) { - - n->fcaps = mfree(n->fcaps); - -+#if HAVE_SELINUX - if (n->selinux_label) { - freecon(n->selinux_label); - n->selinux_label = NULL; - } -+#endif - - n->device_size = UINT64_MAX; - -@@ -658,18 +660,20 @@ static int ca_encoder_node_read_selinux_label( - CaEncoder *e, - CaEncoderNode *n) { - -+#if HAVE_SELINUX - char *label; - int r; -+#endif - - assert(e); - assert(n); - - if ((e->feature_flags & CA_FORMAT_WITH_SELINUX) == 0) - return 0; -+#if HAVE_SELINUX - if (n->selinux_label_valid) - return 0; - --#if HAVE_SELINUX - if (n->fd >= 0) - r = fgetfilecon(n->fd, &label) < 0 ? -errno : 0; - else { -@@ -706,10 +710,13 @@ static int ca_encoder_node_read_selinux_label( - - n->selinux_label = label; - } --#endif - - n->selinux_label_valid = true; - return 0; -+ -+#else -+ return -EOPNOTSUPP; -+#endif - } - - static int compare_xattr(const void *a, const void *b) { - -From 42b8c68addc8aed0a829b7678ef0ceefd47dc113 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 26 Jul 2017 10:34:03 -0400 -Subject: [PATCH 2/2] Fix segv in ca_remote_forget_chunk - -With gcc-7.1.1-6.fc27: - -In file included from ../src/caformat-util.h:7:0, - from ../src/caremote.c:8: -../src/caremote.c: In function 'ca_remote_forget_chunk': -../src/util.h:471:13: error: argument 1 null where non-null expected [-Werror=nonnull] - if (strncmp(s, prefix, l) == 0) - ^~~~~~~~~~~~~~~~~~~~~ ---- - src/caremote.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/caremote.c b/src/caremote.c -index 7d49923..755c3a6 100644 ---- a/src/caremote.c -+++ b/src/caremote.c -@@ -2729,7 +2729,7 @@ int ca_remote_forget_chunk(CaRemote *rr, const CaChunkID *id) { - - p = startswith(qpos, "low-priority/"); - if (!p) { -- p = startswith(p, "high-priority/"); -+ p = startswith(qpos, "high-priority/"); - if (!p) { - r = -EBADMSG; - goto finish; diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-backup/casync-2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-backup/casync-2 deleted file mode 100644 index 5b6c44ac61..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-backup/casync-2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install test -DEPEND=app-arch/zstd fuse? ( sys-fs/fuse ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 -DESCRIPTION=casync - Content-Addressable Data Synchronization Tool - is a tool similar to rsync for backing up and updating directory trees -EAPI=6 -HOMEPAGE=https://github.com/systemd/casync -IUSE=fuse selinux doc -KEYWORDS=amd64 -LICENSE=LGPL-2.1 -RDEPEND=app-arch/zstd fuse? ( sys-fs/fuse ) -SLOT=0 -SRC_URI=https://github.com/systemd/casync/archive/v2.tar.gz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e meson 29ef682942c6ff558de2f797a61790c2 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=71060a8c0a9bc9200b5eb72bc90f1d98 From a2677e82c1a4afdc18788d17bad9599e19fe54e0 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 18:26:36 +0000 Subject: [PATCH 20/22] coreos-devel/sdk-extras: Drop casync --- ...extras-0.0.1-r1.ebuild => sdk-extras-0.0.1-r2.ebuild} | 0 .../coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild | 1 - .../metadata/md5-cache/coreos-devel/sdk-extras-0.0.1 | 4 ++-- .../metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r1 | 9 --------- .../metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r2 | 9 +++++++++ 5 files changed, 11 insertions(+), 12 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/{sdk-extras-0.0.1-r1.ebuild => sdk-extras-0.0.1-r2.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r1 create mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r2 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild index 721e002035..a3ede44eb0 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild @@ -17,7 +17,6 @@ IUSE="" RDEPEND=" app-admin/python-updater - app-backup/casync app-crypt/efitools app-crypt/tpm-tools app-editors/emacs diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1 index 8a9679dad3..bac88dd7f0 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1 @@ -4,6 +4,6 @@ EAPI=5 HOMEPAGE=http://coreos.com/docs/sdk/ KEYWORDS=amd64 LICENSE=GPL-2 -RDEPEND=app-admin/python-updater app-backup/casync app-crypt/efitools app-crypt/tpm-tools app-editors/emacs app-editors/nano app-portage/eix app-portage/gentoolkit-dev app-portage/repoman app-misc/screen app-misc/tmux app-text/tree app-text/dos2unix coreos-devel/fero-client dev-util/cscope dev-util/perf dev-util/strace dev-util/valgrind dev-go/glide dev-go/godep dev-python/awscli sys-apps/ed dev-util/catalyst +RDEPEND=app-admin/python-updater app-crypt/efitools app-crypt/tpm-tools app-editors/emacs app-editors/nano app-portage/eix app-portage/gentoolkit-dev app-portage/repoman app-misc/screen app-misc/tmux app-text/tree app-text/dos2unix coreos-devel/fero-client dev-util/cscope dev-util/perf dev-util/strace dev-util/valgrind dev-go/glide dev-go/godep dev-python/awscli sys-apps/ed dev-util/catalyst SLOT=0 -_md5_=cfa13fe850f0f052cdd72b8f4e3f38ba +_md5_=134f3084ed85b3d714721efd8170b3a4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r1 deleted file mode 100644 index 8a9679dad3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=- -DESCRIPTION=Meta ebuild for everything that isn't needed in the SDK, but might be useful -EAPI=5 -HOMEPAGE=http://coreos.com/docs/sdk/ -KEYWORDS=amd64 -LICENSE=GPL-2 -RDEPEND=app-admin/python-updater app-backup/casync app-crypt/efitools app-crypt/tpm-tools app-editors/emacs app-editors/nano app-portage/eix app-portage/gentoolkit-dev app-portage/repoman app-misc/screen app-misc/tmux app-text/tree app-text/dos2unix coreos-devel/fero-client dev-util/cscope dev-util/perf dev-util/strace dev-util/valgrind dev-go/glide dev-go/godep dev-python/awscli sys-apps/ed dev-util/catalyst -SLOT=0 -_md5_=cfa13fe850f0f052cdd72b8f4e3f38ba diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r2 new file mode 100644 index 0000000000..bac88dd7f0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r2 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DESCRIPTION=Meta ebuild for everything that isn't needed in the SDK, but might be useful +EAPI=5 +HOMEPAGE=http://coreos.com/docs/sdk/ +KEYWORDS=amd64 +LICENSE=GPL-2 +RDEPEND=app-admin/python-updater app-crypt/efitools app-crypt/tpm-tools app-editors/emacs app-editors/nano app-portage/eix app-portage/gentoolkit-dev app-portage/repoman app-misc/screen app-misc/tmux app-text/tree app-text/dos2unix coreos-devel/fero-client dev-util/cscope dev-util/perf dev-util/strace dev-util/valgrind dev-go/glide dev-go/godep dev-python/awscli sys-apps/ed dev-util/catalyst +SLOT=0 +_md5_=134f3084ed85b3d714721efd8170b3a4 From 9ede2139506452be79faf82c72ccbbfddd294052 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 19:18:10 +0000 Subject: [PATCH 21/22] dev-python/gdata: Drop dead package --- .../coreos-overlay/dev-python/gdata/Manifest | 1 - .../gdata-2.0.14-tracker-add-issue.patch | 13 -------- .../dev-python/gdata/gdata-2.0.18.ebuild | 31 ------------------- .../dev-python/gdata/metadata.xml | 12 ------- .../md5-cache/dev-python/gdata-2.0.18 | 14 --------- 5 files changed, 71 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-python/gdata/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-python/gdata/files/gdata-2.0.14-tracker-add-issue.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-python/gdata/gdata-2.0.18.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-python/gdata/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.18 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/Manifest deleted file mode 100644 index 7eb56d57e8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gdata-2.0.18.tar.gz 2475552 SHA256 56e7d22de819c22b13ceb0fe1869729b4287f89ebbd4bb55380d7bcf61a1fdb6 SHA512 57d01a8e41fd7507621c10a4ea3e66223aa1d481365269daecdb5ef1bd725915448bcfa5aca9bef3a7fb4b735627d7916b7f971f1c05d7bf840069346e98ceef WHIRLPOOL a3ed7e084436ad858b35970ebc0b73216ca4f041448c1916c0e1ba28f9b6135c0aa80dfb3aa6a5cf31ba6ca0b999e3633e2d6801e5c2c495da0d40feac61afe6 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/files/gdata-2.0.14-tracker-add-issue.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/files/gdata-2.0.14-tracker-add-issue.patch deleted file mode 100644 index fc0032cfee..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/files/gdata-2.0.14-tracker-add-issue.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gdata-2.0.14.orig/src/gdata/projecthosting/client.py 2011-11-17 09:22:17.350490120 -0800 -+++ gdata-2.0.14/src/gdata/projecthosting/client.py 2011-11-17 09:22:44.380842001 -0800 -@@ -67,8 +67,8 @@ class ProjectHostingClient(gdata.client. - new_entry.status = gdata.projecthosting.data.Status(text=status) - - if owner: -- owner = [gdata.projecthosting.data.Owner( -- username=gdata.projecthosting.data.Username(text=owner))] -+ new_entry.owner = gdata.projecthosting.data.Owner( -+ username=gdata.projecthosting.data.Username(text=owner)) - - if labels: - new_entry.label = [gdata.projecthosting.data.Label(text=label) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/gdata-2.0.18.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/gdata-2.0.18.ebuild deleted file mode 100644 index 3ad833b3d7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/gdata-2.0.18.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 pypy ) -PYTHON_REQ_USE="ssl(+),xml(+)" - -inherit distutils-r1 - -DESCRIPTION="Python client library for Google data APIs" -HOMEPAGE="https://github.com/google/gdata-python-client https://pypi.python.org/pypi/gdata" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" -IUSE="examples" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.14-tracker-add-issue.patch" -) - -python_test() { - # run_service_tests.py requires interaction (and a valid Google account), so skip it. - "${PYTHON}" tests/run_data_tests.py -v || die "Test failed under ${EPYTHON}" -} - -python_install_all() { - use examples && local EXAMPLES=( samples/. ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/metadata.xml deleted file mode 100644 index 84c76180c3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-python/gdata/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - python@gentoo.org - Python - - - google/gdata-python-client - gdata - - diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.18 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.18 deleted file mode 100644 index c962963e66..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.18 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+),xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] -DESCRIPTION=Python client library for Google data APIs -EAPI=5 -HOMEPAGE=https://github.com/google/gdata-python-client https://pypi.python.org/pypi/gdata -IUSE=examples python_targets_pypy python_targets_python2_7 -KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux -LICENSE=Apache-2.0 -RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+),xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] -REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 ) -SLOT=0 -SRC_URI=mirror://pypi/g/gdata/gdata-2.0.18.tar.gz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b -_md5_=2b57030e14c8ff668e32b6e041199cab From 7b675537f649194552cd6fed8c998d6d23152370 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 25 Oct 2018 19:19:22 +0000 Subject: [PATCH 22/22] coreos-base/hard-host-depends: Drop gdata It was only used by chromite, which is long gone. --- ...0.0.1-r187.ebuild => hard-host-depends-0.0.1-r188.ebuild} | 0 .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 5 ----- .../metadata/md5-cache/coreos-base/hard-host-depends-0.0.1 | 4 ++-- ...-host-depends-0.0.1-r187 => hard-host-depends-0.0.1-r188} | 4 ++-- 4 files changed, 4 insertions(+), 9 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r187.ebuild => hard-host-depends-0.0.1-r188.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/{hard-host-depends-0.0.1-r187 => hard-host-depends-0.0.1-r188} (92%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r187.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r188.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r187.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r188.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index a129789ab3..72c89fc2db 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -127,11 +127,6 @@ RDEPEND="${RDEPEND} net-misc/wget " -# Host dependencies that are needed for chromite/bin/upload_package_status -RDEPEND="${RDEPEND} - dev-python/gdata - " - # Host dependencies for building ISOs RDEPEND="${RDEPEND} virtual/cdrtools diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1 index 050a8af820..fddd367ffa 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1 @@ -4,6 +4,6 @@ EAPI=2 HOMEPAGE=http://src.chromium.org KEYWORDS=amd64 x86 LICENSE=GPL-2 -RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu coreos-base/cros-devutils[cros_host] =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go:1.6 dev-lang/go:1.7 dev-lang/go:1.8 dev-lang/go:1.9 dev-lang/go:1.10 dev-lang/go:1.11 dev-lang/go-bootstrap dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/ctypesgen dev-python/mako sys-devel/bc dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] net-misc/google-cloud-sdk sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-fs/squashfs-tools coreos-base/update_engine dev-python/pylint net-misc/openssh net-misc/wget dev-python/gdata virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad +RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu coreos-base/cros-devutils[cros_host] =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go:1.6 dev-lang/go:1.7 dev-lang/go:1.8 dev-lang/go:1.9 dev-lang/go:1.10 dev-lang/go:1.11 dev-lang/go-bootstrap dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/ctypesgen dev-python/mako sys-devel/bc dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] net-misc/google-cloud-sdk sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-fs/squashfs-tools coreos-base/update_engine dev-python/pylint net-misc/openssh net-misc/wget virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad SLOT=0 -_md5_=c3f3771876526f28411a83141cc7ad3c +_md5_=3f559f0e345f95e14cdbbac1636c0d13 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r187 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r188 similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r187 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r188 index 050a8af820..fddd367ffa 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r187 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r188 @@ -4,6 +4,6 @@ EAPI=2 HOMEPAGE=http://src.chromium.org KEYWORDS=amd64 x86 LICENSE=GPL-2 -RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu coreos-base/cros-devutils[cros_host] =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go:1.6 dev-lang/go:1.7 dev-lang/go:1.8 dev-lang/go:1.9 dev-lang/go:1.10 dev-lang/go:1.11 dev-lang/go-bootstrap dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/ctypesgen dev-python/mako sys-devel/bc dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] net-misc/google-cloud-sdk sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-fs/squashfs-tools coreos-base/update_engine dev-python/pylint net-misc/openssh net-misc/wget dev-python/gdata virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad +RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu coreos-base/cros-devutils[cros_host] =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go:1.6 dev-lang/go:1.7 dev-lang/go:1.8 dev-lang/go:1.9 dev-lang/go:1.10 dev-lang/go:1.11 dev-lang/go-bootstrap dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/ctypesgen dev-python/mako sys-devel/bc dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] net-misc/google-cloud-sdk sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-fs/squashfs-tools coreos-base/update_engine dev-python/pylint net-misc/openssh net-misc/wget virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad SLOT=0 -_md5_=c3f3771876526f28411a83141cc7ad3c +_md5_=3f559f0e345f95e14cdbbac1636c0d13