From 22bf1d99f97e321b69370d154e0cd404c496ac9e Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 9 Feb 2017 12:09:20 -0800 Subject: [PATCH] bump(sys-libs/efivar): sync with upstream --- .../metadata/md5-cache/sys-libs/efivar-0.21 | 12 +++++ .../metadata/md5-cache/sys-libs/efivar-0.23 | 12 +++++ .../metadata/md5-cache/sys-libs/efivar-27 | 12 +++++ .../metadata/md5-cache/sys-libs/efivar-30 | 12 +++++ .../portage-stable/sys-libs/efivar/Manifest | 15 ++++++ .../sys-libs/efivar/efivar-0.21.ebuild | 31 ++++++++++++ .../sys-libs/efivar/efivar-0.23.ebuild | 45 +++++++++++++++++ .../sys-libs/efivar/efivar-27.ebuild | 44 +++++++++++++++++ .../sys-libs/efivar/efivar-30.ebuild | 48 +++++++++++++++++++ .../efivar/files/0.21-initializer.patch | 42 ++++++++++++++++ .../efivar/files/0.21-nvme_ioctl.h.patch | 30 ++++++++++++ .../sys-libs/efivar/files/0.22-flags.patch | 41 ++++++++++++++++ .../efivar/files/0.23-sysmacros.patch | 29 +++++++++++ .../sys-libs/efivar/metadata.xml | 11 +++++ 14 files changed, 384 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.21 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.23 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-27 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-30 create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.21.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.23.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-27.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-30.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-initializer.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.22-flags.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.23-sysmacros.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.21 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.21 new file mode 100644 index 0000000000..41f69ef76f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.21 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure prepare +DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 +DESCRIPTION=Tools and library to manipulate EFI variables +EAPI=5 +HOMEPAGE=https://github.com/rhinstaller/efivar +KEYWORDS=amd64 ia64 x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/popt +SLOT=0 +SRC_URI=https://github.com/rhinstaller/efivar/releases/download/0.21/efivar-0.21.tar.bz2 +_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=eb41f3ab5fc1f61234c7fed03e0a1d4c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.23 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.23 new file mode 100644 index 0000000000..96ce6599d1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.23 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 +DESCRIPTION=Tools and library to manipulate EFI variables +EAPI=5 +HOMEPAGE=https://github.com/rhinstaller/efivar +KEYWORDS=~amd64 ~ia64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/popt +SLOT=0 +SRC_URI=https://github.com/rhinstaller/efivar/releases/download/0.23/efivar-0.23.tar.bz2 +_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=e1a0176fe2e6768e0f06f0148ee76598 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-27 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-27 new file mode 100644 index 0000000000..77a66a20df --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-27 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 +DESCRIPTION=Tools and library to manipulate EFI variables +EAPI=6 +HOMEPAGE=https://github.com/rhinstaller/efivar +KEYWORDS=~amd64 ~ia64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/popt +SLOT=0/27 +SRC_URI=https://github.com/rhinstaller/efivar/archive/27.tar.gz -> efivar-27.tar.gz +_eclasses_=multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=5df423bb6b4ba7d7a438eb6ba3fa878c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-30 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-30 new file mode 100644 index 0000000000..82fd928c72 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-30 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 +DESCRIPTION=Tools and library to manipulate EFI variables +EAPI=6 +HOMEPAGE=https://github.com/rhinstaller/efivar +KEYWORDS=amd64 ~ia64 x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/popt +SLOT=0/1 +SRC_URI=https://github.com/rhinstaller/efivar/archive/30.tar.gz -> efivar-30.tar.gz +_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=ba772dacaf9bc79f70df8724a7f8ef4d diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/Manifest new file mode 100644 index 0000000000..d0abb1ddf6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/Manifest @@ -0,0 +1,15 @@ +AUX 0.21-initializer.patch 1261 SHA256 ce6792192c9014bd0db4acbf0866f3d6eb1e608225177cbfaf6dd54b7d447bf5 SHA512 e7593fcefead06007a2314217b4be61161261b2be06c631065ede00f48098b924395605faba2ef859be9b6a242d531942460f2b51ea346d1cb93af94ecb23b3c WHIRLPOOL efcec5c85046ba5acff2b8559fad7c05175ed791ea84f47587013e90a3e2c301df507a776097795f0003625fbc40b95d79ecb1a349ee5ee08d5b4a7ad841b452 +AUX 0.21-nvme_ioctl.h.patch 728 SHA256 f71fb95d12800bc6934213ee2541dbeea2adb8e545929330b4baf5a049bb52e6 SHA512 55dcb19d7d651ba32426c903b9000957829b924f1a0eda52a6368f0378b04f80da3849d86bb28258360592b568105ae0c0b0a20e6663cfb99c2d28dac1592611 WHIRLPOOL 708cb89b07f886168b19c8b9a8bf1ab37596efb65035102631eb0615ebc4ff41b447574bdf441e9a7fc58471e4abef59e220c728154719abd3ece4b164459b7d +AUX 0.22-flags.patch 1436 SHA256 b4cd72973b860d0377e37aa1d44f6324ccbbc99f1bd79b3139c189f08c24c008 SHA512 aa793faa4c583d5cc585bb1942c87e2906b8db74bb99e567aae54b065237e3ad4a74659d1220db700e0badca411f5daa5edc00eed3327a79dfa83f52cf2b3627 WHIRLPOOL 28535287d5dabe6b993909fabd064e2f8636e69caa15f2ae9f9320a8822b31407bbab038f44ea59e70293ba6ad6f921b9c4dcd1dbeb93364c25c17046354c839 +AUX 0.23-sysmacros.patch 619 SHA256 2e54f440504881f7bba0554f48ff0cd389eb4522a442d7cbb7a5092cf227cb9a SHA512 8e7bf9d98c4a9d57dda785a4b70b8bdf723cec2efa13d42ca5a13c52822760306673cefece7a7f03a3768d962bba80698b6133c3036c6b88d8319ab623862188 WHIRLPOOL d8ca7633d1854c355aa2026df2464127cca26e71957ccb5df99a1eba677193864dc20e1da3f19dc5f1ba37abe1a727e1e9f680eff8a8988f71f503cd4674b562 +DIST efivar-0.21.tar.bz2 66677 SHA256 04b9b9de9d9a1a013395400438a033daf4a4290f497ec5be04a120e2ac535094 SHA512 851b5e29c2dab213bb81c6ea5c5c211d36fb6846de8aa1086b0657f06917c2f93bf154aa3a4c2dda22103bdf1d67ca877f9771dc3f979c9311ca24e0bc09492a WHIRLPOOL d6cdb2e2f047a22677d046581490ee4e64a2ac0631be8e41bf6250241b2554f62ddf81226fa3970ee80ebb9ec62665ca21f4fec94cc5ebe05414b0c674ad38dd +DIST efivar-0.23.tar.bz2 67558 SHA256 9ca81f56b0c9177b6536c8187c9cf5974723abcaf57cd34173500c80bff3caa4 SHA512 ff95c735425708cef0f85f1e9f8909e64651d10c303927d9e77d44fcb0a02ec90e4a364b0315cc3f5e30d77059ed2d8f43cc1efbed2db09a695ef7a6f1bb58f4 WHIRLPOOL 35207e4040041c03d105bbf7b2f7f103f1415dbc51dce9614ddba99786b6cacdf88136ab3a888551cf494c3d55685c7991c72fac1c6223255128c7c191e0318c +DIST efivar-27.tar.gz 86132 SHA256 d9457b06f234c9430aeaa6f30f7d7c786fb8ce3261a935afa8de51e2c1b4816d SHA512 354934c166b37f78a11497a4819075b13d44bf43587dc52d0a9773d77df52df2d2b553e5ff799911ab506441d0ea82825f6d1b019932e0bcfbacdd69a241bc9e WHIRLPOOL 5eae9999aa7790112beb5aa03e98ac7d380b1bf9f3fdef10ca7ffda73ee68b1a4cb1a410d0060dca1caef3734fc80d6778a90eccc80719904d5d7f9285db7ab0 +DIST efivar-30.tar.gz 86395 SHA256 20709c76311f8eb8be92977b7ac008ce62501fa9f7fe885a784321540fc352f9 SHA512 ab73c2a49175e01cb4872bfb47708a71399c6f8237a02fbbbf4755fcd10efb82984baf76a83c3b3e7f5cf4183050e535cf18dff2bbfed10d9a0f5d4cf2021b32 WHIRLPOOL d0a7fe13e4359ddafb717b666b81fdecf786f8cc3a794e47a46d80064cd402780feeab5f501f9b0796d3a847b58611b7581341e0e9cb4449d86e75e6903591eb +EBUILD efivar-0.21.ebuild 706 SHA256 47939529738177827ba067256fe0c6ea48cf04a41f03f88af0d741074d144e22 SHA512 fc6a3a1c76ec8b25d30ea583d396c7865d744885af53bea2925c30447de80733b61c2d0a117f880204f7f4dfada2d4ecec5809fb542d0427fabc6453ee7bd287 WHIRLPOOL a02fe6a6b935d96dfac4486c512da83a252ca9c860402362a80626eee9c9249fc7e0c2cd9be5124725f0d53a40f913f5391c33340af0a8be7611b85df0729e4f +EBUILD efivar-0.23.ebuild 916 SHA256 af96e11494bb76c3bbe793362bf23fc8aca8818d4bb171e420c26049e4a6bdca SHA512 062a4b66bed578fb88936763663c5d832ad02d27388b83f92a83ac0ba2dd28a6771ecb6320dc6d3888f9516c231e201c842223f5227bf4ae0f89d3d992eebec8 WHIRLPOOL 918e0df209b0e9dd17906ccffbd382c1b1dfe54d11784609ee082a42104a7fd90f25d213eccddaad57bbe76b7f8b070514a26521dd956304c0779c7c65a4efc0 +EBUILD efivar-27.ebuild 853 SHA256 5230427c3652dcb3658321aeb88b590c83a657aabbca5ef4f7a4d7874f815a1f SHA512 97747190705d76d11a28d14e9485c2a76445cc03d0284a771dc538960ff5a64159c634ae0da901cbed8a65668f60b0786d94f68a051febc6f6f68ec4dd0e51d3 WHIRLPOOL 90431a70a1d261fce537aab25fafaf201a9dcf789532145f2c656aca7df224374c9e681a11307639d12da2dd9ef275cc18aea035092a14009cf1d74d1549a66a +EBUILD efivar-30.ebuild 934 SHA256 1ac71cc5b573619273abd86cf4d5937b2c6aaa11d319c5055c779c2b4169c17f SHA512 2b2121ae75e660db96c9939b7f990f580c8f22a243b86dd846848e81ea067cf4984d4fdb35799db3c754b9dba67df1481c836a03345b637ed079b565c1be2e17 WHIRLPOOL eaee11dcd010b099efb1c7de959200fb9fe964c9fcc9ad5117839651bfeedd4c3dcc019c9a8febc274ee9fc1cb7fcd219c7008d44f2c9afcf1c88a97b8b6bdcd +MISC ChangeLog 5093 SHA256 a7e3e89cd86e8ad9cac2ed75c7acc58e26ea86a1bcad2dd59f4bafd007a74353 SHA512 1c762c73aaafcb54493d2c999563bece398c2a0a1779f9a1b08849f1c26c2b38c4cca8773f977112c286bca9d403319b0facf1fd215c730ab5c2932425084f2d WHIRLPOOL 7956e84bb38f194dc89bd0216971a67dc52dfb9f7294b318c79f36a306fdf69e00abbbb1b154f4a602384d3c8f728eafe4d139f31cc98f9286f18b8f43e3fa83 +MISC ChangeLog-2015 1400 SHA256 19acadd29d4ade26e28eb1b3c90b53fe7bd656c994429ddd2c0210a5c4781ef7 SHA512 a3ddd6f45f6b7d7f29435fea17bd76448dcaed5d15f06aa8e8824d7e1a92848c2ef19204cac4201c4a940103d6f874148f3e9b1726af99c9c778dab5f09598bc WHIRLPOOL 9a685232976e2381e39f103e98fb3df05c0c9ac1ef48ef063f5a2dbab414cd6de464bc775a8d9890cf1f9f2aafe2c102e16ac9c22e04d938f0039c2fcd319bed +MISC metadata.xml 329 SHA256 562af8ae9d4eac40cd37ccea2827ecb766176649c836296a10a75dddc4446181 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df WHIRLPOOL b6c568a210bf85aea3dffae55d3f861fae101047b431b9ed64f60a61ac5b76d4866d63298a8a11e42f78c013388bc932b1fdd73d44a82fa2476138f2521f3444 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.21.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.21.ebuild new file mode 100644 index 0000000000..f53d3363b0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.21.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="Tools and library to manipulate EFI variables" +HOMEPAGE="https://github.com/rhinstaller/efivar" +SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ia64 x86" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-3.18" + +src_prepare() { + epatch "${FILESDIR}/0.21-initializer.patch" + epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch" + epatch_user +} + +src_configure() { + tc-export CC + export libdir="/usr/$(get_libdir)" + unset LIBS # Bug 562004 +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.23.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.23.ebuild new file mode 100644 index 0000000000..49b536202a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.23.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="Tools and library to manipulate EFI variables" +HOMEPAGE="https://github.com/rhinstaller/efivar" +SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~x86" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-3.18" + +src_prepare() { + epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch" + epatch "${FILESDIR}/0.23-sysmacros.patch" + epatch_user +} + +src_configure() { + tc-export CC + tc-ld-disable-gold + export libdir="/usr/$(get_libdir)" + unset LIBS # Bug 562004 +} + +src_compile() { + # Avoid building static binary/libs + opts=( + BINTARGETS=efivar + STATICLIBTARGETS= + ) + emake "${opts[@]}" +} + +src_install() { + emake "${opts[@]}" DESTDIR="${D}" install +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-27.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-27.ebuild new file mode 100644 index 0000000000..7db73e1e64 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-27.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Tools and library to manipulate EFI variables" +HOMEPAGE="https://github.com/rhinstaller/efivar" +SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ia64 ~x86" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-3.18" + +src_prepare() { + default + sed -i -e s/-Werror// gcc.specs || die +} + +src_configure() { + tc-export CC + tc-ld-disable-gold + export libdir="/usr/$(get_libdir)" + unset LIBS # Bug 562004 +} + +src_compile() { + # Avoid building static binary/libs + opts=( + BINTARGETS=efivar + STATICLIBTARGETS= + ) + emake "${opts[@]}" +} + +src_install() { + emake "${opts[@]}" DESTDIR="${D}" install +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-30.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-30.ebuild new file mode 100644 index 0000000000..dfb105faae --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-30.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Tools and library to manipulate EFI variables" +HOMEPAGE="https://github.com/rhinstaller/efivar" +SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/1" +KEYWORDS="amd64 ~ia64 x86" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-3.18" + +src_prepare() { + default + sed -i -e s/-Werror// gcc.specs || die +} + +src_configure() { + tc-export CC + + # https://github.com/rhinstaller/efivar/issues/64 + append-cflags -flto + + tc-ld-disable-gold + export libdir="/usr/$(get_libdir)" + unset LIBS # Bug 562004 +} + +src_compile() { + # Avoid building static binary/libs + opts=( + BINTARGETS=efivar + STATICLIBTARGETS= + ) + emake "${opts[@]}" +} + +src_install() { + emake "${opts[@]}" DESTDIR="${D}" install +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-initializer.patch b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-initializer.patch new file mode 100644 index 0000000000..25d0659683 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-initializer.patch @@ -0,0 +1,42 @@ +From a3606c02fd271d32e364fcc540e34ba1899309f6 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 14 Jul 2015 09:33:54 -0400 +Subject: [PATCH] Sometimes the compiler doesn't like { 0, } as an + initializer... + +Because it really wants to be { {0, },} or something, and sometimes the +compiler, knowing full well what we're trying to do, likes to complain +about the rigor applied to our technique in doing it. + +memset() the struct ifreq to 0 instead so I don't need to figure out its +internal structure just to zero it out. + +Resolves #28 + +Signed-off-by: Peter Jones +--- + src/linux.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/linux.c b/src/linux.c +index 57f71f3..817b8e6 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -847,12 +847,13 @@ ssize_t + __attribute__((__visibility__ ("hidden"))) + make_mac_path(uint8_t *buf, ssize_t size, const char * const ifname) + { +- struct ifreq ifr = { 0, }; ++ struct ifreq ifr; + struct ethtool_drvinfo drvinfo = { 0, }; + int fd, rc; + ssize_t ret = -1, sz, off=0; + char busname[PATH_MAX+1] = ""; + ++ memset(&ifr, 0, sizeof (ifr)); + strncpy(ifr.ifr_name, ifname, IF_NAMESIZE); + drvinfo.cmd = ETHTOOL_GDRVINFO; + ifr.ifr_data = (caddr_t)&drvinfo; +-- +2.4.6 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch new file mode 100644 index 0000000000..221ec5a731 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch @@ -0,0 +1,30 @@ +From ae0869b71a90bc14e67f3c917bd9c96db25c99a6 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 14 Jan 2016 17:02:31 -0500 +Subject: [PATCH] Workaround rename of linux/nvme.h + +Bug: https://bugs.gentoo.org/571548 +--- + src/linux.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/linux.c b/src/linux.c +index 5ebc151..e551377 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -22,7 +22,12 @@ + #include + #include + #include ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) ++#include ++#else + #include ++#endif + #include + #include + #include +-- +2.7.0 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.22-flags.patch b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.22-flags.patch new file mode 100644 index 0000000000..df49f43af7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.22-flags.patch @@ -0,0 +1,41 @@ +From 5bc17590cb096340fc695da3020883130437d745 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 12 Feb 2016 13:22:13 -0500 +Subject: [PATCH] Make.defaults: Improve gcc/clang detection + +The old filter only matched "gcc" or "clang". + +The new findstring call matches any occurance of gcc or clang. This is +useful when CC includes the full host tuple, like x86_64-pc-linux-gnu-gcc. + +Signed-off-by: Mike Gilbert +--- + Make.defaults | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index bf814b8..5aed21e 100644 +--- a/Make.defaults ++++ b/Make.defaults +@@ -25,14 +25,14 @@ PKGS = + clang_cflags = + gcc_cflags = -specs=$(TOPDIR)/gcc.specs + cflags = $(CFLAGS) -I${TOPDIR}/src/include/efivar/ \ +- $(if $(filter $(CC),clang),$(clang_cflags),) \ +- $(if $(filter $(CC),gcc),$(gcc_cflags),) \ ++ $(if $(findstring clang,$(CC)),$(clang_cflags),) \ ++ $(if $(findstring gcc,$(CC)),$(gcc_cflags),) \ + $(call pkg-config-cflags) + clang_ccldflags = + gcc_ccldflags = + ccldflags = $(cflags) $(CCLDFLAGS) $(LDFLAGS) \ +- $(if $(filter $(CCLD),clang),$(clang_ccldflags),) \ +- $(if $(filter $(CCLD),gcc),$(gcc_ccldflags),) \ ++ $(if $(findstring clang,$(CCLD)),$(clang_ccldflags),) \ ++ $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \ + $(call pkg-config-ccldflags) + SOFLAGS=-shared + LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs) +-- +2.7.1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.23-sysmacros.patch b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.23-sysmacros.patch new file mode 100644 index 0000000000..526b8436c2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.23-sysmacros.patch @@ -0,0 +1,29 @@ +From 554b0255f9ee265f7d093ac875215207fac8fb1e Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 15 Apr 2016 17:58:15 -0400 +Subject: [PATCH] Include sys/sysmacros.h when sys/types.h does not define + major + +glibc is planning to drop this from sys/types.h. +--- + src/linux.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/linux.c b/src/linux.c +index 866455d..fde6947 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -36,6 +36,10 @@ + #include + #include + ++#ifndef major ++#include ++#endif ++ + #include + #include + +-- +2.8.1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/metadata.xml new file mode 100644 index 0000000000..f9d83d4843 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/metadata.xml @@ -0,0 +1,11 @@ + + + + + floppym@gentoo.org + Mike Gilbert + + + rhinstaller/efivar + +