diff options
Diffstat (limited to 'sys-boot')
17 files changed, 96 insertions, 808 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz Binary files differindex 6e1f8e713098..5897e46257e1 100644 --- a/sys-boot/Manifest.gz +++ b/sys-boot/Manifest.gz diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest index 21676893a8fd..f11f32b08f49 100644 --- a/sys-boot/efibootmgr/Manifest +++ b/sys-boot/efibootmgr/Manifest @@ -3,5 +3,5 @@ DIST efibootmgr-15.tar.bz2 35476 BLAKE2B 19b7c9ce51f3b930b2d59fa4a594c7a8bf5f1c7 DIST efibootmgr-16.tar.bz2 36603 BLAKE2B 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232 SHA512 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9 EBUILD efibootmgr-14.ebuild 600 BLAKE2B 6c7abd14248f9050e338d83a7f507e27d61c1c55e16777312c23e2e52d33bcfc1e67d5b4efcb97d936e7fb654125088f77188eda8cf153613ba20bfd5e1f52cf SHA512 bf5c805869ca09f72486abf901697298c7dbbd9966dbc8ff559c5486dd2e8631ce107ad36603b0a3c88c29537a891246f98eeaf5352c7c65ee29d93ef204cf85 EBUILD efibootmgr-15.ebuild 624 BLAKE2B 4d9c2ff8566d909f20f23da76e500a405f5d30f2fc5c397ce89e93b0eb577b8a58c4f0258661ad68aacd9c6306a269588a17df2ed47e9dcbf97cae90396c301c SHA512 7258da126a9462f91506ec3295d2ffb062f78c8dd23875e947145d30dff8c879d98f881637061bc819f4902d4ad5794f214e716664e13f71142aba9c7945f79e -EBUILD efibootmgr-16.ebuild 689 BLAKE2B 669b906526bcceeec6f2618445ae28b4e268754041ae0212775a3016e69fe733866f6b31913c7a27d7dc9aebd1c0bb6e2a334a93fb89fb339a842c48ccd19d12 SHA512 4a4414eebb77b7551161c70c4662b3da37cc8c1b44a170d739b3f61c0cee72929469b58c80bb829ddfe7977ee14e6c30a2117c4e1164cfd5ebcfb592c79d2e4c +EBUILD efibootmgr-16.ebuild 688 BLAKE2B fc1e09125bc8ac38207ea18c62a751f9d90dba8aa8339960dc3513c550dd02e14643112d38c3c6fb41ecfc0cc2cc48b498c577bce409814218b1068d61de29a4 SHA512 9723e5df48764d86a0371827087356724c0400de470efae6cc3dbd7fd81d9c6c796a7af126a329a68dcafac121b6d11c1fd95600d542c20962778917886f7c05 MISC metadata.xml 626 BLAKE2B d426af2d479b07fa3d8e482b5d1b84bd242f5da9399ab9cd2d2512d2192f815ccb099ca7c8d3ee91c8c87e1715c9649deaa565aa6ec025c26b518e778d84989e SHA512 d52646244bf9c0d10d8c5b986e110944905fc8f898c0330f65cd6c734e6d8cfabf72854cef362f411d3d63fed3f5e22207a7b94d1ea8076e566d8eff228bb33b diff --git a/sys-boot/efibootmgr/efibootmgr-16.ebuild b/sys-boot/efibootmgr/efibootmgr-16.ebuild index 6c909738c7f9..83a3903ac373 100644 --- a/sys-boot/efibootmgr/efibootmgr-16.ebuild +++ b/sys-boot/efibootmgr/efibootmgr-16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 x86" IUSE="" RDEPEND="sys-apps/pciutils diff --git a/sys-boot/grub-static/Manifest b/sys-boot/grub-static/Manifest deleted file mode 100644 index 3d28fab93d6e..000000000000 --- a/sys-boot/grub-static/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -DIST grub-static-0.97-r10.tar.bz2 888963 BLAKE2B 1891685b312c129efb47fd78ffd2a433655225b8dcb8a60592faabbc5300ce6d56efea70272cf9a1e8cfaa70224d1a3a313d1c2e2296bfd43593a4a12aec541e SHA512 2a18405c9f7b0712dac2246213f723c1a2be6734bff133b7906e7c18e4370faf924f35d3b834d74761cf50b3ab59e969fbff010e13292618187c65a72aa45a87 -DIST grub-static-0.97-r12.tar.bz2 1171586 BLAKE2B 066cde81f4b1849467d83ec982745dc8449e38895edc0eee979d6ea782a802c2a2c6b2a4f03eb976c03ce3f6e3213d3605e9bb6c99f8479e59fafb1716cbd0c9 SHA512 0a4c0b3b556db366df70c7c51a1a26f614f949be4002d7f9a053b7261b80c2c49410e8fd04c7e3717ea560e7cbc6a692d859d07bdfe2099a78a33bce78ac5395 -DIST grub-static-0.97-r9.tar.bz2 937621 BLAKE2B a61fa8b41de4208cf30222fa742bb84a5f60bb924f5cf57f12ae9a382b1bf9e7feff740029ca3a08939d070275b4bb5389981c9a26f6decd18d4c7120f8d0f52 SHA512 a8b1f7cd416f2c41c88ba5c34889e7afe9615bf985e69b2d1d3ec2a20b7ceb13e53e8b3df91a5077bfa1a217f3274362033d72f9bafe3ad22be378f26728035c -EBUILD grub-static-0.97-r10.ebuild 5402 BLAKE2B 981e8f761083e4725de45b10d16db2b8e11b54eaaa0e4793b2e7633832c5d758f5abcbe47d846f3b3fc85eefb6d2946f354bc584358bb55034b39b7e00a8b1b0 SHA512 6523ea58548adfab70c50f136b179ce3cc03669fa78b6efac28208f8b68eb43bb5bfa2039b57f7516fc068ebc267e219df2567f1ac7750f713ff878bd15eb3bf -EBUILD grub-static-0.97-r12.ebuild 5402 BLAKE2B 6e3fa13bd6349cd5d468a799c748fe5f64dcb2a743c10bae241b8148bde4b1ff3c2a56d920b8e9ead3de1ccd4014dce2514861b2e87ccfbba30e51ec5d317d31 SHA512 5d7be3447bf3eb2c0fade5fe31616a6ba8df5c52ecfb2a0782bb5a569ece553f98e1fbaa9caa6580160ffad4d9db135dfa491136727c43c0dbb96e3b292a4a1c -EBUILD grub-static-0.97-r9.ebuild 5297 BLAKE2B 692292ba38851671d6a7315a5deaca1f99b371cb254fd958271fa6ad490e450c0924de2b59be8a4096b1a545335923677a945d2aef34436b2b191083e07b573b SHA512 f44b2305b5d5691c0de0ae4acf75def1d1d5c52bfd2db9b44dfc268d7bb5f667d63c96fb8bea722fffeada7c8e623ee2505aefb43528ff9e225c306752f4ee8b -MISC metadata.xml 242 BLAKE2B a110ca18fd86f3fcfe9a5c10ecd97d2c9727c04919ddf21976ceffcdf65dd1069c81e4ad554301b847665892de1313320836a327ca1f36381cb0f9e21219e9e8 SHA512 0891a67242a0cd36cac143b427affa9241ec8f8173b79423632349d542f9bc6e2097ffbb8e96b560c41e13b5b43ddf0f822962da98b5d2e58068d7855acb4965 diff --git a/sys-boot/grub-static/grub-static-0.97-r10.ebuild b/sys-boot/grub-static/grub-static-0.97-r10.ebuild deleted file mode 100644 index 0eb33ec53e23..000000000000 --- a/sys-boot/grub-static/grub-static-0.97-r10.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -# XXX: we need to review menu.lst vs grub.conf handling. We've been converting -# all systems to grub.conf (and symlinking menu.lst to grub.conf), but -# we never updated any of the source code (it still all wants menu.lst), -# and there is no indication that upstream is making the transition. - -inherit eutils mount-boot toolchain-funcs linux-info - -PATCHVER="1.9" # Not used, just for tracking with main grub - -DESCRIPTION="GNU GRUB Legacy boot loader (static build)" - -HOMEPAGE="https://www.gnu.org/software/grub/" -SRC_URI="mirror://gentoo/${PF}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 ~x86" -IUSE="" -DEPEND="!<sys-boot/grub-2" -RDEPEND="${DEPEND}" - -# These are already stripped since we use a binpkg. -QA_PRESTRIPPED="/sbin/grub /bin/mbchk" - -pkg_setup() { - local arch="$(tc-arch)" - case ${arch} in - amd64) - CONFIG_CHECK='~IA32_EMULATION' - WARNING_IA32_EMULATION="You will NOT be able to run grub unless you have IA32_EMULATION set!" - check_extra_config - ;; - esac -} - -src_install() { - cp -a "${WORKDIR}"/* "${D}"/ - if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then - run_test_grub "${D}"/sbin/grub && einfo "New grub can run on your system, good!" - fi -} - -run_test_grub() { - local grub="$1" - local version="$(${grub} \ - --read-only --no-pager --no-floppy --no-curses \ - --no-config-file --batch --version)" - local error="grub test-run failed" - use amd64 && error="${error} Is IA32_EMULATION set?" - [ "${version/${PV}}" != "${version}" ] || die "${error}" - return 0 -} - -# -# Below this point, everything is also used in grub-static! -# Please keep in sync! -# - -setup_boot_dir() { - local boot_dir=$1 - local dir=${boot_dir} - - if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then - run_test_grub /sbin/grub - fi - - mkdir -p "${dir}" - [[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot" - dir="${dir}/grub" - if [[ ! -e ${dir} ]] ; then - mkdir "${dir}" || die "${dir} does not exist!" - fi - - # change menu.lst to grub.conf - if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then - mv -f "${dir}"/menu.lst "${dir}"/grub.conf - ewarn - ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" - ewarn - fi - - if [[ ! -e ${dir}/menu.lst ]]; then - einfo "Linking from new grub.conf name to menu.lst" - ln -snf grub.conf "${dir}"/menu.lst - fi - - if [[ -e ${dir}/stage2 ]] ; then - mv "${dir}"/stage2{,.old} - ewarn "*** IMPORTANT NOTE: you must run grub and install" - ewarn "the new version's stage1 to your MBR. Until you do," - ewarn "stage1 and stage2 will still be the old version, but" - ewarn "later stages will be the new version, which could" - ewarn "cause problems such as an unbootable system." - ewarn "This means you must use either grub-install or perform" - ewarn "root/setup manually! For more help, see the handbook:" - ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto" - ebeep - fi - - einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}" - for x in \ - "${ROOT}"/lib*/grub/*/* \ - "${ROOT}"/usr/lib*/grub/*/* \ - "${ROOT}"/usr/share/grub/* ; do - [[ -f ${x} ]] && cp -p "${x}" "${dir}"/ - done - - if [[ ! -e ${dir}/grub.conf ]] ; then - s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo" - [[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf - [[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf - [[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf - fi - - # Per bug 218599, we support grub.conf.install for users that want to run a - # specific set of Grub setup commands rather than the default ones. - grub_config=${dir}/grub.conf.install - [[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf - if [[ -e ${grub_config} ]] ; then - local tmp="${TMPDIR}/${P}-setup_boot_dir-$$" - egrep \ - -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ - "${grub_config}" >"${tmp}" - # Do NOT fail here, only warn. - /sbin/grub --batch \ - --device-map="${dir}"/device.map \ - >/dev/null <"${tmp}" - rc=$? - [[ $rc -ne 0 ]] && ewarn "Grub failed to run!" - fi - - # the grub default commands silently piss themselves if - # the default file does not exist ahead of time - if [[ ! -e ${dir}/default ]] ; then - # This may fail, don't worry about it. - grub-set-default --root-directory="${boot_dir}" default - : - fi - einfo "Grub has been installed to ${boot_dir} successfully." -} - -pkg_postinst() { - mount-boot_pkg_postinst - - if [[ -n ${DONT_MOUNT_BOOT} ]]; then - elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply" - elog "the following instructions for your /boot!" - elog "Neglecting to do so may cause your system to fail to boot!" - elog - else - setup_boot_dir "${ROOT}"/boot - # Trailing output because if this is run from pkg_postinst, it gets mixed into - # the other output. - einfo "" - fi - elog "To interactively install grub files to another device such as a USB" - elog "stick, just run the following and specify the directory as prompted:" - elog " emerge --config =${PF}" - elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell" - elog "grub where to install in a non-interactive way." - -} - -pkg_config() { - local dir - if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then - einfo "Enter the directory where you want to setup grub:" - read dir - else - dir="${GRUB_ALT_INSTALLDIR}" - fi - setup_boot_dir "${dir}" -} diff --git a/sys-boot/grub-static/grub-static-0.97-r12.ebuild b/sys-boot/grub-static/grub-static-0.97-r12.ebuild deleted file mode 100644 index b824c17fb821..000000000000 --- a/sys-boot/grub-static/grub-static-0.97-r12.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -# XXX: we need to review menu.lst vs grub.conf handling. We've been converting -# all systems to grub.conf (and symlinking menu.lst to grub.conf), but -# we never updated any of the source code (it still all wants menu.lst), -# and there is no indication that upstream is making the transition. - -inherit eutils mount-boot toolchain-funcs linux-info - -PATCHVER="1.14" # Not used, just for tracking with main grub - -DESCRIPTION="GNU GRUB Legacy boot loader (static build)" - -HOMEPAGE="https://www.gnu.org/software/grub/" -SRC_URI="mirror://gentoo/${PF}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 ~x86" -IUSE="" - -DEPEND="!<sys-boot/grub-2" -RDEPEND="${DEPEND}" - -S=${WORKDIR} - -pkg_setup() { - case $(tc-arch) in - amd64) - CONFIG_CHECK='~IA32_EMULATION' - WARNING_IA32_EMULATION="You will NOT be able to run grub unless you have IA32_EMULATION set!" - check_extra_config - ;; - esac -} - -src_install() { - cp -a * "${D}"/ - # Make sure the docs get compressed - dodoc usr/share/doc/${PF}/* - - if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then - run_test_grub "${D}"/sbin/grub && einfo "New grub can run on your system, good!" - fi -} - -run_test_grub() { - local grub="$1" - local version="$(${grub} \ - --read-only --no-pager --no-floppy --no-curses \ - --no-config-file --batch --version)" - local error="grub test-run failed" - use amd64 && error="${error} Is IA32_EMULATION set?" - [ "${version/${PV}}" != "${version}" ] || die "${error}" - return 0 -} - -# -# Below this point, everything is also used in grub-static! -# Please keep in sync! -# - -setup_boot_dir() { - local boot_dir=$1 - local dir=${boot_dir} - - if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then - run_test_grub /sbin/grub - fi - - mkdir -p "${dir}" - [[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot" - dir="${dir}/grub" - if [[ ! -e ${dir} ]] ; then - mkdir "${dir}" || die - fi - - # change menu.lst to grub.conf - if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then - mv -f "${dir}"/menu.lst "${dir}"/grub.conf - ewarn - ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" - ewarn - fi - - if [[ ! -e ${dir}/menu.lst ]]; then - einfo "Linking from new grub.conf name to menu.lst" - ln -snf grub.conf "${dir}"/menu.lst - fi - - if [[ -e ${dir}/stage2 ]] ; then - mv "${dir}"/stage2{,.old} - ewarn "*** IMPORTANT NOTE: you must run grub and install" - ewarn "the new version's stage1 to your MBR. Until you do," - ewarn "stage1 and stage2 will still be the old version, but" - ewarn "later stages will be the new version, which could" - ewarn "cause problems such as an unbootable system." - ewarn "This means you must use either grub-install or perform" - ewarn "root/setup manually! For more help, see the handbook:" - ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto" - ebeep - fi - - einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}" - for x in \ - "${ROOT}"/lib*/grub/*/* \ - "${ROOT}"/usr/lib*/grub/*/* \ - "${ROOT}"/usr/share/grub/* ; do - [[ -f ${x} ]] && cp -p "${x}" "${dir}"/ - done - - if [[ ! -e ${dir}/grub.conf ]] ; then - s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo" - [[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf - [[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf - [[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf - fi - - # Per bug 218599, we support grub.conf.install for users that want to run a - # specific set of Grub setup commands rather than the default ones. - grub_config=${dir}/grub.conf.install - [[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf - if [[ -e ${grub_config} ]] ; then - local tmp="${TMPDIR}/${P}-setup_boot_dir-$$" - egrep \ - -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ - "${grub_config}" >"${tmp}" - # Do NOT fail here, only warn. - /sbin/grub --batch \ - --device-map="${dir}"/device.map \ - >/dev/null <"${tmp}" - rc=$? - [[ $rc -ne 0 ]] && ewarn "Grub failed to run!" - fi - - # the grub default commands silently piss themselves if - # the default file does not exist ahead of time - if [[ ! -e ${dir}/default ]] ; then - # This may fail, don't worry about it. - grub-set-default --root-directory="${boot_dir}" default - fi - einfo "Grub has been installed to ${boot_dir} successfully." -} - -pkg_postinst() { - mount-boot_mount_boot_partition - - if [[ -n ${DONT_MOUNT_BOOT} ]]; then - elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply" - elog "the following instructions for your /boot!" - elog "Neglecting to do so may cause your system to fail to boot!" - elog - else - setup_boot_dir "${ROOT}"/boot - # Trailing output because if this is run from pkg_postinst, it gets mixed into - # the other output. - einfo "" - fi - elog "To interactively install grub files to another device such as a USB" - elog "stick, just run the following and specify the directory as prompted:" - elog " emerge --config =${PF}" - elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell" - elog "grub where to install in a non-interactive way." - - # needs to be after we call setup_boot_dir - mount-boot_pkg_postinst -} - -pkg_config() { - local dir - if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then - einfo "Enter the directory where you want to setup grub:" - read dir - else - dir="${GRUB_ALT_INSTALLDIR}" - fi - setup_boot_dir "${dir}" -} diff --git a/sys-boot/grub-static/grub-static-0.97-r9.ebuild b/sys-boot/grub-static/grub-static-0.97-r9.ebuild deleted file mode 100644 index 47441893ef6b..000000000000 --- a/sys-boot/grub-static/grub-static-0.97-r9.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -# XXX: we need to review menu.lst vs grub.conf handling. We've been converting -# all systems to grub.conf (and symlinking menu.lst to grub.conf), but -# we never updated any of the source code (it still all wants menu.lst), -# and there is no indication that upstream is making the transition. - -inherit eutils mount-boot toolchain-funcs linux-info - -PATCHVER="1.9" # Not used, just for tracking with main grub - -DESCRIPTION="GNU GRUB Legacy boot loader (static build)" - -HOMEPAGE="https://www.gnu.org/software/grub/" -SRC_URI="mirror://gentoo/${PF}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="" -DEPEND="!<sys-boot/grub-2" -RDEPEND="${DEPEND}" - -# These are already stripped since we use a binpkg. -QA_PRESTRIPPED="/sbin/grub /bin/mbchk" - -pkg_setup() { - local arch="$(tc-arch)" - case ${arch} in - amd64) - CONFIG_CHECK='~IA32_EMULATION' - WARNING_IA32_EMULATION="You will NOT be able to run grub unless you have IA32_EMULATION set!" - check_extra_config - ;; - esac -} - -src_install() { - cp -a "${WORKDIR}"/* "${D}"/ - run_test_grub "${D}"/sbin/grub && einfo "New grub can run on your system, good!" -} - -run_test_grub() { - local grub="$1" - local version="$(${grub} \ - --read-only --no-pager --no-floppy --no-curses \ - --no-config-file --batch --version)" - local error="grub test-run failed" - use amd64 && error="${error} Is IA32_EMULATION set?" - [ "${version/${PV}}" != "${version}" ] || die "${error}" - return 0 -} - -# -# Below this point, everything is also used in grub-static! -# Please keep in sync! -# - -setup_boot_dir() { - local boot_dir=$1 - local dir=${boot_dir} - - run_test_grub /sbin/grub - - mkdir -p "${dir}" - [[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot" - dir="${dir}/grub" - if [[ ! -e ${dir} ]] ; then - mkdir "${dir}" || die "${dir} does not exist!" - fi - - # change menu.lst to grub.conf - if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then - mv -f "${dir}"/menu.lst "${dir}"/grub.conf - ewarn - ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" - ewarn - fi - - if [[ ! -e ${dir}/menu.lst ]]; then - einfo "Linking from new grub.conf name to menu.lst" - ln -snf grub.conf "${dir}"/menu.lst - fi - - if [[ -e ${dir}/stage2 ]] ; then - mv "${dir}"/stage2{,.old} - ewarn "*** IMPORTANT NOTE: you must run grub and install" - ewarn "the new version's stage1 to your MBR. Until you do," - ewarn "stage1 and stage2 will still be the old version, but" - ewarn "later stages will be the new version, which could" - ewarn "cause problems such as an unbootable system." - ewarn "This means you must use either grub-install or perform" - ewarn "root/setup manually! For more help, see the handbook:" - ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto" - ebeep - fi - - einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}" - for x in \ - "${ROOT}"/lib*/grub/*/* \ - "${ROOT}"/usr/lib*/grub/*/* \ - "${ROOT}"/usr/share/grub/* ; do - [[ -f ${x} ]] && cp -p "${x}" "${dir}"/ - done - - if [[ ! -e ${dir}/grub.conf ]] ; then - s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo" - [[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf - [[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf - [[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf - fi - - # Per bug 218599, we support grub.conf.install for users that want to run a - # specific set of Grub setup commands rather than the default ones. - grub_config=${dir}/grub.conf.install - [[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf - if [[ -e ${grub_config} ]] ; then - local tmp="${TMPDIR}/${P}-setup_boot_dir-$$" - egrep \ - -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ - "${grub_config}" >"${tmp}" - # Do NOT fail here, only warn. - /sbin/grub --batch \ - --device-map="${dir}"/device.map \ - >/dev/null <"${tmp}" - rc=$? - [[ $rc -ne 0 ]] && ewarn "Grub failed to run!" - fi - - # the grub default commands silently piss themselves if - # the default file does not exist ahead of time - if [[ ! -e ${dir}/default ]] ; then - # This may fail, don't worry about it. - grub-set-default --root-directory="${boot_dir}" default - : - fi - einfo "Grub has been installed to ${boot_dir} successfully." -} - -pkg_postinst() { - mount-boot_pkg_postinst - - if [[ -n ${DONT_MOUNT_BOOT} ]]; then - elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply" - elog "the following instructions for your /boot!" - elog "Neglecting to do so may cause your system to fail to boot!" - elog - else - setup_boot_dir "${ROOT}"/boot - # Trailing output because if this is run from pkg_postinst, it gets mixed into - # the other output. - einfo "" - fi - elog "To interactively install grub files to another device such as a USB" - elog "stick, just run the following and specify the directory as prompted:" - elog " emerge --config =${PF}" - elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell" - elog "grub where to install in a non-interactive way." - -} - -pkg_config() { - local dir - if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then - einfo "Enter the directory where you want to setup grub:" - read dir - else - dir="${GRUB_ALT_INSTALLDIR}" - fi - setup_boot_dir "${dir}" -} diff --git a/sys-boot/grub-static/metadata.xml b/sys-boot/grub-static/metadata.xml deleted file mode 100644 index 0c723031cff1..000000000000 --- a/sys-boot/grub-static/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>amd64@gentoo.org</email> - <name>AMD64 Project</name> -</maintainer> -</pkgmetadata> diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest index c0b533a646d8..b0008742b3da 100644 --- a/sys-boot/vboot-utils/Manifest +++ b/sys-boot/vboot-utils/Manifest @@ -1,11 +1,5 @@ -AUX vboot-utils-42_p20150219-cgpt-static.patch 1092 BLAKE2B 48d6631e3d6d9072dad8513964b6192d066d5a593cd7bad8c26339d5136002b9870522e1bc2bf8e3a52f0da05bc72ed0f2b06bd635bbb2f2380092223edcc104 SHA512 bb01fbb11d015bc8e817e14e4326908d5338a9a3bb657004c8539b561e0be21c7f3ee9d2b43d8fcadc302ee9991effb65778d22b2a8ade92faa5234041288d4f -AUX vboot-utils-42_p20150219-sysmacros.patch 1228 BLAKE2B 546f8b34e3e35a580a230002c462fae324851460100e619171a1ce2364a680e719e7666c4118fc1e69d50cf563cfb999b55167fe49fa2a1267d0d7d54128997f SHA512 50bb342dbe6266562d979e453f8744ad43cc859e35a2a9b6e5a420b0e395012d88bd631bc6c02b023cd58c80e0371932d8d7539a541d5adfc79b769659411fbc -DIST vboot-utils-20130222gite6cf2c2-3.fc19.src.rpm 2170079 BLAKE2B b05013b54a4a6a7c9bbdcaeca5b01c7cc75ff9d58e9594a47da914d49dfc0dc4b8d4a31c9f1af5b2414e911ac310f7200731ee78c8941dc3d5fceb97bc34e9bc SHA512 ccb5320f01d270ff30465e6ffc234d245220afdb9628f9b5f9e8abc7c91c5e58085b5e8eefe217e85faa18166576d945cad9f757d99927389473cb0a4337a05f -DIST vboot-utils-42_p20150219.tar.xz 18578108 BLAKE2B b5780f35a66ebed39b4c26b75820ac1574691d85c8bd222a3602c79aa92c1058448996bdefc501a3772b116fbf888e93139f8cce10465780d2956de877cc0377 SHA512 bf1b5579f80bfd3804d74f5fed5ca0f85ff3d66cc4efd1c5e744ab0de50309c7e5168fe9a751579e9fcc0cb7dda72fc98497b2e13437b357b0ad9bb063edd33a -DIST vboot-utils-51_p20160427.tar.xz 18377808 BLAKE2B 7938c9fb69a0da7d4d8b62f1f9b5f911658d6a3673b198f603e20b5e2ed29d989fc92f74eb7553f0fec230fc062bb85785f6ac01ef537944ce144d87690551c2 SHA512 5b9af2815b8939ae21f4e430744902ccd811627d668eaba709354901eb70553e57050b9068b07fecdfec5bb2ece0c11f1cf0f1a01c0e5f886d1913e1478fe3d7 DIST vboot-utils-59_p20170413.tar.xz 18431260 BLAKE2B 73853f92c5855a1fbcad55c696414317f46a06a69901529dd6da19be2abe4ca0337cf20dddc4f84f1d2a99357bb2f01df115b7d16c45f9af62dcd1b833580d46 SHA512 f92b9aed7a52ac7bab49b624725d4963564a22a03741619ad4ef1bc0a1fdee5123c68f3dad5bef9fb033f94f2a9ae99478c16386758fe4667a361bc91dda8048 -EBUILD vboot-utils-1.0_p20130222.ebuild 1527 BLAKE2B 8acc26629ac7096c4f500a1f7a065bb83d4d7919606179911d15e954eabbf63db78217d1f5e391a63b8b48858862af5bfb28930881725c2bd7812bb2f7da1417 SHA512 0617df165249896f758a7f623edf0cc80e7ed470510097a5f60b3eab46dbfa7210d4500b80bebc2d38ac4b48b1ef60fef2bbcfed113ca2526c8fa640f2853433 -EBUILD vboot-utils-42_p20150219.ebuild 2021 BLAKE2B f6c4bfe442aca86ab7358ff9efb77a808f3508efef015a7dbaead08bb26c7810da32eada15a909dfd7969ecc9d42c277a4e7bf8cefcd7f89119291d5d4f30cb8 SHA512 ebae142d837a43b011e8979597b42564ef22e990a1e84dc40f49b0263edfa5be49b770c551bd0bc167447bebb6edd2fc55c14289628aac9e8c51e9c7e9288568 -EBUILD vboot-utils-51_p20160427.ebuild 1950 BLAKE2B a37c82c9e868c2cd3e78df0bd26ecee6b55a8f397e0090303d0fc38ae632e1a030c5f0414259d010de79beb7e7a4d8083fe9281b82c09834c86ae4b483c0da33 SHA512 4bf2d1bbcebe4d9396d606c58a5adcb0593b0189e049a6429ddf6966c3419a0f4349e7b3abd76ec58496c13d5f5a09dab79acf1278aa1a88eb408bdffc22cf4f -EBUILD vboot-utils-59_p20170413.ebuild 1959 BLAKE2B 8a61ceba02fcd0dca40dda695a70e994fd5c2b8b0ac660191a3baf6f72cd6eaae82f8598e1c6c489a2a655ff05d23f1153000bfe1baf775a2da222f5e01a7734 SHA512 111a065659df702beb8982fc65d1e8cf962156fed5e317b659d7480fa5751c9ea8fed7af9e7b81c549a3c1deb72691da570faadd59494d2cebd4521eb7976ea3 +DIST vboot-utils-72_p20181229.tar.xz 18489004 BLAKE2B 444eb0bc2c571ad79d26d473da724016d6d041207beaae161f6c1155768ff9d0b1c8b7b070b828083cc1396266cc77175a75e8067ce22613c75b4d77780dda75 SHA512 41df034dc5498bcbec0d49a472331ceb2fbc2eb3b4173d5c56e920d65ae485382b3d811e5f2c13cf45a1b05a5d6a24197924fa1c76ada9c3aac14fa3c4c363fe +EBUILD vboot-utils-59_p20170413.ebuild 1961 BLAKE2B d519504ba8c955b164395dc95b2a0bc275548c97adcefe6c90ef81bd3ebe1ec8554f4fc42d2197227ee140d5c14a3b1f7097034cbdd42f065e756758b881a253 SHA512 90bab2830cab6eb87ccb8e85f1953c6b48c75accfc8c13a46a54fefeba2cd070497fab821b0103a0e4310c42e90bd546d3bb737dbff50a4b225f05d4dccc923e +EBUILD vboot-utils-72_p20181229.ebuild 2627 BLAKE2B d60fa4e962e8fe03d17c082e5ea8f35da186eaf6a3bd2065ad561cf190330009cc39f028886c1aee5c68650e8328f3755f8c679687e8207443a90ad36e549f7f SHA512 b66494a0ab22bc9999d0eaea7736884a7948c76f38a18db58853888145e17165810dd86a8756759e97b5f12bdb43bf8962422f1bc3384040b86fdce4b0c31948 MISC metadata.xml 488 BLAKE2B b3c656e8e93662a5fd2cfb7559ca150c9df50831789447fe1e4aa58b99b205daa70b5bcfc98e1e78e44cf0ef89ef9a6efc8563d31c2d3823aa7c07d1ec4cf3fb SHA512 b9c53eec1a6b1db1274f2baf51915691e36678eb1cc8e6b7cc1596b4912410b86e96175cd6cd614acc044a3b2fbf8ef350ba69daf6741802e926fc3ec2c73914 diff --git a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch b/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch deleted file mode 100644 index 3f53fc7be769..000000000000 --- a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9d437e9122019568df7fa2d602f911e6a873d78b Mon Sep 17 00:00:00 2001 -From: Anatol Pomazau <anatol@google.com> -Date: Thu, 19 Feb 2015 05:11:51 -0800 -Subject: [PATCH] Remove duplicated linker flag - -We already set '-static' to LDFLAGS above no need to do it again here. - -TEST=build with 'make' and 'make STATIC=1'. Check that 'STATIC=1' adds '-static' linker flag. -BUG=None - -Change-Id: I83e23984753094af203432eb4570930085788398 -Reviewed-on: https://chromium-review.googlesource.com/251151 -Reviewed-by: Mike Frysinger <vapier@chromium.org> -Reviewed-by: Hung-Te Lin <hungte@chromium.org> -Reviewed-by: Anatol Pomazau <anatol@google.com> -Commit-Queue: Anatol Pomazau <anatol@google.com> -Tested-by: Anatol Pomazau <anatol@google.com> ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index dfa971c..c0c5f50 100644 ---- a/Makefile -+++ b/Makefile -@@ -960,7 +960,6 @@ ${CGPT_WRAPPER}: ${CGPT_WRAPPER_OBJS} ${UTILLIB} - .PHONY: cgpt - cgpt: ${CGPT} ${CGPT_WRAPPER} - --${CGPT}: LDFLAGS += -static - ${CGPT}: LDLIBS += -luuid - - ${CGPT}: ${CGPT_OBJS} ${UTILLIB} --- -2.3.1 - diff --git a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch b/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch deleted file mode 100644 index 508f54076766..000000000000 --- a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://chromium-review.googlesource.com/339680 -https://bugs.gentoo.org/580554 - -From 7fff56afefd4e63dce2366636c084d4c1f1f95d4 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Tue, 19 Apr 2016 13:58:49 -0400 -Subject: [PATCH] include sys/sysmacros.h for major() - -The major() func is defined in the sys/sysmacros.h header, so include it -explicitly for the prototype. Upstream C libs are moving away from having -sys/types.h include it all the time implicitly. - -BUG=None -TEST=precq passes -BRANCH=None - -Change-Id: I56b84138f08ded2376193403f9c9db22c5f24f71 ---- - -diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c -index dcfaab9..1716cdd 100644 ---- a/cgpt/cgpt_wrapper.c -+++ b/cgpt/cgpt_wrapper.c -@@ -18,6 +18,7 @@ - #include <stdio.h> - #include <string.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - #include <sys/types.h> - #include <unistd.h> - -diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c -index 4fe990c..abf37ae 100644 ---- a/futility/dump_kernel_config_lib.c -+++ b/futility/dump_kernel_config_lib.c -@@ -10,6 +10,7 @@ - #include <string.h> - #include <sys/mman.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - #include <sys/types.h> - #include <unistd.h> - diff --git a/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild b/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild deleted file mode 100644 index 8a5b61a8c149..000000000000 --- a/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils rpm toolchain-funcs - -KEYWORDS="~amd64 ~arm ~x86" -DESCRIPTION="Chrome OS verified boot tools" -HOMEPAGE="http://git.chromium.org/gitweb/?p=chromiumos/platform/vboot_reference.git" -EGIT_COMMIT="e6cf2c21a1cd6fc46b6adcaadc865e2f8bd4874e" -MY_VERSION="${PV##*_p}git${EGIT_COMMIT:0:7}" -MY_PV="${PN}-${MY_VERSION}" -SRC_URI="http://kojipkgs.fedoraproject.org/packages/${PN}/${MY_VERSION}/3.fc19/src/${MY_PV}-3.fc19.src.rpm" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="app-arch/xz-utils:= - dev-libs/libyaml:= - dev-libs/openssl:0= - sys-apps/util-linux:=" - -DEPEND="app-crypt/trousers - ${RDEPEND}" - -S=${WORKDIR} - -src_unpack() { - rpm_unpack ${A} - unpack ./${MY_PV}.tar.xz - mv ./${MY_PV}/* ./ || die -} - -src_prepare() { - epatch *.patch - sed -e 's:-Werror ::g' -e 's:-nostdinc ::g' \ - -i Makefile || die -} - -src_compile() { - mkdir "${S}"/build-main || die - tc-export CC AR CXX PKG_CONFIG - emake \ - -j1 \ - V=1 \ - BUILD="${S}"/build-main \ - ARCH=$(tc-arch) \ - all - unset CC AR CXX PKG_CONFIG -} - -src_test() { - # ARCH and HOST_ARCH must be identical in order - # to avoid calling qemu. - local arch=$(tc-arch) - [[ ${arch} == amd64 ]] && arch=x86_64 - emake \ - V=1 \ - BUILD="${S}"/build-main \ - ARCH=${arch} \ - HOST_ARCH=${arch} \ - runtests -} - -src_install() { - emake \ - V=1 \ - BUILD="${S}"/build-main \ - DESTDIR="${ED}/usr/bin" \ - install - insinto /usr/share/vboot/devkeys - doins tests/devkeys/* - dodoc README -} diff --git a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild b/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild deleted file mode 100644 index 5b70868f8f2b..000000000000 --- a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -# This is the latest commit in the latest branch. -GIT_SHA1="f44ebbe36b2c1603437edc57b534244e89bfcd9c" - -DESCRIPTION="Chrome OS verified boot tools" -HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot" -# Can't use gitiles directly until b/19710536 is fixed. -#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz" -SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" -IUSE="libressl minimal static" - -LIB_DEPEND=" - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - sys-apps/util-linux:=[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - !minimal? ( - app-arch/xz-utils:= - dev-libs/libyaml:= - )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - app-crypt/trousers" - -S=${WORKDIR} - -src_prepare() { - epatch "${FILESDIR}"/${P}-cgpt-static.patch - epatch "${FILESDIR}"/${P}-sysmacros.patch #580554 - sed -i \ - -e 's: -Werror : :g' \ - -e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \ - -e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \ - Makefile || die -} - -_emake() { - local arch=$(tc-arch) - emake \ - V=1 \ - QEMU_ARCH= \ - ARCH=${arch} \ - HOST_ARCH=${arch} \ - LIBDIR="$(get_libdir)" \ - DEBUG_FLAGS= \ - MINIMAL=$(usev minimal) \ - STATIC=$(usev static) \ - "$@" -} - -src_compile() { - tc-export CC AR CXX PKG_CONFIG - _emake TEST_BINS= all -} - -src_test() { - _emake runtests -} - -src_install() { - _emake DESTDIR="${ED}" install - - insinto /usr/share/vboot/devkeys - doins tests/devkeys/* - - insinto /usr/include/vboot - doins host/include/* \ - firmware/include/gpt.h \ - firmware/include/tlcl.h \ - firmware/include/tss_constants.h - - dolib.a build/libvboot_host.a - - dodoc README -} diff --git a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild b/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild index 15f315769e8d..12b8ef351c9f 100644 --- a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild +++ b/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" IUSE="libressl minimal static" LIB_DEPEND=" - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + !libressl? ( <dev-libs/openssl-1.1:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) sys-apps/util-linux:=[static-libs(+)]" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) diff --git a/sys-boot/vboot-utils/vboot-utils-51_p20160427.ebuild b/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild index 67c54ce41195..273d3ec48ff2 100644 --- a/sys-boot/vboot-utils/vboot-utils-51_p20160427.ebuild +++ b/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit eutils toolchain-funcs # This is the latest commit in the latest branch. -GIT_SHA1="48b1a50b086e39332d2e1e51a73434e39c40b329" +GIT_SHA1="a32c930e8c46424a3bba3c296fd78b3e60f50aeb" DESCRIPTION="Chrome OS verified boot tools" HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot" # Can't use gitiles directly until b/19710536 is fixed. #SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz" -SRC_URI="mirror://gentoo/${P}.tar.xz" +SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz" LICENSE="BSD" SLOT="0" @@ -20,25 +21,42 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" IUSE="libressl minimal static" LIB_DEPEND=" + dev-libs/libyaml:=[static-libs(+)] + app-arch/xz-utils:=[static-libs(+)]" +LIB_DEPEND_MINIMAL=" !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - sys-apps/util-linux:=[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - !minimal? ( - app-arch/xz-utils:= - dev-libs/libyaml:= + sys-apps/util-linux:=[static-libs(+)] + dev-libs/libzip:=[static-libs(+)]" +RDEPEND="!static? ( + ${LIB_DEPEND_MINIMAL//\[static-libs(+)]} + !minimal? ( ${LIB_DEPEND//\[static-libs(+)]} ) )" DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) + static? ( + ${LIB_DEPEND_MINIMAL} + !minimal? ( ${LIB_DEPEND} ) + ) app-crypt/trousers" S=${WORKDIR} src_prepare() { + default sed -i \ -e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \ -e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \ + -e 's:${TEST_INSTALL_DIR}/bin:${TEST_INSTALL_DIR}/usr/bin:' \ + -e '/cgpt -D 358400/d' \ Makefile || die + sed -e 's:^BIN_DIR=${BUILD_DIR}/install_for_test/bin:BIN_DIR=${BUILD_DIR}/install_for_test/usr/bin:' \ + -i tests/common.sh || die + sed -e "s:/mnt/host/source/src/platform/vboot_reference:${S}:" \ + -i tests/futility/expect_output/* || die + if use libressl; then + sed -e '/OPENSSL_VERSION_NUMBER/d' \ + -i host/include/openssl_compat.h || die #674522 + fi } _emake() { diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest index ddfa3f5664a0..84402cd0dfea 100644 --- a/sys-boot/woeusb/Manifest +++ b/sys-boot/woeusb/Manifest @@ -1,3 +1,5 @@ DIST woeusb-3.1.5.tar.gz 399712 BLAKE2B d52b29249af680577299a02cb9a2c1436aef73a0240bff2525c494657c197a2fc0709e0ff6f35eb5d18592145347af284a998deacecff37effd95b75ab13bc9a SHA512 5cf4eb45b126d71bcb376148383faf9713bc06ec4ee3ccc2dfa6528d9fba382bceaae2cdd47f2d8ba775dad1ca8e6258af40fc6362336927894398193600c965 +DIST woeusb-3.2.12.tar.gz 386189 BLAKE2B 53629a185d0b8ff55cb2e60eaa6cb8f9e106d3f5b24f57cf8f777dbf5b9a1e43ed423e53e4710acf9ac5ce3171da7dbfcd40b5b3f297b0db240e7c0f9a687fc0 SHA512 9a4e20003970a3313b080bde9a534fb1724382555281aa510092a3698622dae46f22483ff8968903b5685e00ebfb454718de6db7f3c61c4a2e122c961bfc270f EBUILD woeusb-3.1.5.ebuild 1036 BLAKE2B 05f973a5a8fd401e9555b5d87cb961a78d0383c8944eabdd35387bb4edb0897eeb184d379647496b6765bcce1d1016cf7d5baa6abba89b6ba1483a91b090b4b8 SHA512 1c8b86ec2a14ff16ad6e82616ff2430b1a364a68ef00b03a330240800ded5e55e1ca0f518523a7c792955846a35b372b396c804c29e1b68c479ec8a49d600671 +EBUILD woeusb-3.2.12.ebuild 1038 BLAKE2B 372b8f269cd8e8e65df8ecce53d8a7838a7baae4da64147e900afe5aeaa7bdc19968aeef120bd17269d48cfdb602b521bbbd4da5dcdc2a503070d270d8c60d85 SHA512 89f65e4f0ef0e5deb11c2aae51d4d4dc55cba9db3751aa34046dd7c6a48691316e1be4a7f3e5644e5202ff4b1bdfd318e44c6ab87700fe4ea07575decd994a7a MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9 diff --git a/sys-boot/woeusb/woeusb-3.2.12.ebuild b/sys-boot/woeusb/woeusb-3.2.12.ebuild new file mode 100644 index 000000000000..81c09abcf2ef --- /dev/null +++ b/sys-boot/woeusb/woeusb-3.2.12.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WX_GTK_VER="3.0-gtk3" + +inherit autotools wxwidgets + +DESCRIPTION="Creates windows installer on usb media from an iso image" +HOMEPAGE="https://github.com/slacka/WoeUSB" +SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="minimal" + +RDEPEND=" + sys-apps/util-linux + sys-block/parted + sys-fs/dosfstools + sys-fs/ntfs3g + sys-boot/grub:2[grub_platforms_pc] + !minimal? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/WoeUSB-${PV}" + +src_prepare() { + default + find . -type f -print0 | xargs -0 sed -i "s/@@WOEUSB_VERSION@@/${PV}/" || die + if ! use minimal; then + setup-wxwidgets + eautoreconf + fi +} + +src_configure() { + ! use minimal && default +} + +src_compile() { + ! use minimal && default +} + +src_test() { + ! use minimal && default +} + +src_install() { + if use minimal; then + dosbin src/woeusb + einstalldocs + else + default + fi +} |