parent
7ddb466ee9
commit
4465342588
@ -1,5 +1 @@
|
||||
AUX unzip-6.0-alt-natspec.patch 13152 RMD160 c81b0a284261c62ee4ca068f3e9e21cd822ab937 SHA1 bd75071d8b5100104cd40c9d3d6731e613e68de4 SHA256 63bb3e0ac91eca324aaadd6036aff94b8d480ba4e5193a954629f1e661cea25d
|
||||
AUX unzip-6.0-no-exec-stack.patch 381 RMD160 c45c06fd6a4fc88ce051637b6d7f1f4b0e09fa48 SHA1 d26e9fb76d73d77c2651198a3b27ae8bfb06fb34 SHA256 ae62249dcf8bbc3c30468b07944df6c8777b565927d9ed6d1fdf7395899ea7c7
|
||||
DIST unzip60.tar.gz 1376845 RMD160 48af66606e9472e45fbb94bc4e285da23d1b89ba SHA1 abf7de8a4018a983590ed6f5cbd990d4740f8a22 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
|
||||
EBUILD unzip-6.0-r9.ebuild 2106 RMD160 65dfb624c4217a46f30142095ccaa8b6a75f9f66 SHA1 35a1c38be3b69e1353ad9f8749ce820b696c90d5 SHA256 6049acf34cfa05b3ee71e71bdc45358fce2333f5ba7d28c4be6e612752cc693c
|
||||
MISC ChangeLog 384 RMD160 73bf3e142914ba3c056a60c02869f58fbf990897 SHA1 972f5b10073e6fcfc324cb0530f760302ea240bc SHA256 7b0c382033fbc9c6006df9801fe54f8e24f631bc0fcb49bdbc6ed7b8226acc15
|
||||
DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
|
||||
|
@ -1 +0,0 @@
|
||||
EBUILD xorg-meta-7.4-r2.ebuild 1589 SHA256 1f9c6616e9d41651c04c13231ed205ec7ddea03e2dd72a359e144180855f82e3 SHA512 1850e124d23b8f74da4553972e628700d9e27bb1f9c3f8e6d4d7edde853da56433ea1db333fdec5f876991bac4ee89b42ec2829d292909544208be3941673a7a WHIRLPOOL 534d6b696740d989784d4bbdc7ae9a1c06099335798a4ce8c4f4d3635e7210b40467b654e487528efab5a4f5d621b942063c1b8f99e43d32bfc9efe826903eb6
|
@ -1,5 +1 @@
|
||||
AUX m2crypto-extension-work.patch 15334 RMD160 87f3dbe2a37766a36c113f8c1dfebb27b3da3499 SHA1 f9a052c2a52228ad5ec31b9257fb40768c846b66 SHA256 c34350b9a71d3a5164efda2a43810a38b38a508055b73fabcad5c9170e6e55ab
|
||||
DIST M2Crypto-0.21.1.tar.gz 413563 RMD160 313dcab450846a0363e7192a10364bdfd5dfae85 SHA1 3c7135b952092e4f2eee7a94c5153319cccba94e SHA256 25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
|
||||
EBUILD m2crypto-0.21.1-r1.ebuild 1780 RMD160 faf278e61e7d7d68d40d017e91c755603383d233 SHA1 2a589fbbe9a4abf5a0c268fb2a14c5661a27c8d8 SHA256 a28f78e64f1ba01bb7445036ba57844616574c7f14ef522415bdce219d859518
|
||||
MISC ChangeLog 275 RMD160 19449eb33dd38c3dbc4044a00b47245aacbf863d SHA1 39b6d5dda59efb98f0d02e2fd66d9af086815257 SHA256 bda6b4a77261b62024f062c06dcb7f561a0f2e8ed58f5c3cc5836a704a6b6411
|
||||
MISC metadata.xml 231 RMD160 ad294626d246597289aa417a92223d41a9d043aa SHA1 8f533fb2b62282c42a352ceefd06f1e31cdb19cf SHA256 4b3c3ef12b8947ff65c09c0c6bbeda5e9837776cbd593d20951d4fca97b38fc8
|
||||
DIST M2Crypto-0.21.1.tar.gz 413563 SHA256 25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a SHA512 b261eed84b3bda8a664c065241c2007f6443235a0fbcdd856c5a0b1f015e75662724b72a56e94aeb174414fff5c8dd71dfcb4b18f677f576ab7e30811a8adf9b WHIRLPOOL 88f184452a660cff934371d18e0065974dec3cea052cf78ef0bbecf35ed2ef6d69f8a40016f1b3fbac24fa06697b7e4c5e9e1f6afd20d30ff63fa1c22b69e8d0
|
||||
|
@ -1,3 +1 @@
|
||||
DIST pymilter-0.9.3.tar.gz 96362 RMD160 2f7783775f6dd85c4c0073e0526cc18df22bc2ce SHA1 353197d3c17c20dd13014bf5a3197678ea328db5 SHA256 fd1e424a25fc40e9908c6ae6b03dae4381e21bd600c80180dd4cc712499cd3c1
|
||||
EBUILD pymilter-0.9.3.ebuild 485 RMD160 b193749cc67795ee25d57cfffaa8243e2fa544a0 SHA1 6139ce53d5af839a3bc17a0eb4b9764cff330e9b SHA256 9ab7bbd0cff174496cb11fdcd366fd8345419dd7a7e3021409f3ffaa6dc5878f
|
||||
MISC ChangeLog 254 RMD160 a94727c2166898f44e51be6e043ef4e17fc1eb9f SHA1 7d1ba560c1827da4134ee6d2b84068cea22e2678 SHA256 cf0a0af66328c8a6b337b4015b6f1cf8c66c83d1b670ba849310734e7f1c3d2b
|
||||
DIST pymilter-0.9.3.tar.gz 96362 SHA256 fd1e424a25fc40e9908c6ae6b03dae4381e21bd600c80180dd4cc712499cd3c1
|
||||
|
@ -1,3 +1 @@
|
||||
DIST soaplib-1.0.0.tar.gz 68722 RMD160 4e91819e83283a45c6883127bff2a096ed56183c SHA1 937c39e356ef7726030f3d41987e8c612f3e9401 SHA256 3f92388651ef4595824006094626b0bfa257cc04c53c1e129cea0e851b652dba
|
||||
EBUILD soaplib-1.0.0.ebuild 859 RMD160 cd6dc91b80d7c7aceb24608655cd1e315debce6c SHA1 494a147f3bbf10189f701b65eb2c4c753456160b SHA256 348d429c97065c8f7777a1921b79c91a277da917c084d11589de83806cb016c3
|
||||
MISC metadata.xml 266 RMD160 84716260658a48493fd1abde8ef2745911629729 SHA1 43f465f09edbbc46fe72227aa3ffb1235fcf3033 SHA256 5befc3fb6db71e8add5a2adb3cf0f5ce6df4d388c0fc401b3de2722d33dabbe9
|
||||
DIST soaplib-1.0.0.tar.gz 68722 SHA256 3f92388651ef4595824006094626b0bfa257cc04c53c1e129cea0e851b652dba
|
||||
|
@ -1,199 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
#
|
||||
# Original Author: © 2007-2009 Mir Calculate, Ltd.
|
||||
# Purpose: Installing linux-desktop, linux-server.
|
||||
# Build the kernel from source.
|
||||
|
||||
inherit calculate eutils kernel-2
|
||||
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst
|
||||
|
||||
IUSE="vmlinuz minimal"
|
||||
|
||||
REQUIRED_USE="minimal? ( vmlinuz )"
|
||||
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
if [[ ${KV_MAJOR} -ge 3 ]]
|
||||
then
|
||||
CKV=$(get_version_component_range 1-3)
|
||||
CL_PATCH=$(get_version_component_range 1-2)
|
||||
local oldifs=${IFS}
|
||||
export IFS="."
|
||||
local OKV_ARRAY=( $OKV )
|
||||
export IFS=${oldifs}
|
||||
if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then
|
||||
# handle calculate-sources-3.x.y correctly
|
||||
if [[ ${KV_PATCH} -gt 0 ]]; then
|
||||
KERNEL_URI="${KERNEL_BASE_URI}/patch-${OKV}.xz"
|
||||
UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.xz"
|
||||
fi
|
||||
KERNEL_URI="${KERNEL_URI} ${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz"
|
||||
else
|
||||
KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
|
||||
fi
|
||||
else
|
||||
die "Eclass is used only for kernel-3"
|
||||
fi
|
||||
SLOT=$(get_version_component_range 1-4)
|
||||
KV_FULL="${PV}-calculate"
|
||||
S="${WORKDIR}/linux-${KV_FULL}"
|
||||
|
||||
CALC_K_SUBV=.$(get_version_component_range 4)
|
||||
[[ ${CALC_K_SUBV} == "." ]] && CALC_K_SUBV=
|
||||
|
||||
EXTRAVERSION="${CALC_K_SUBV}-calculate"
|
||||
|
||||
UNIPATCH_STRICTORDER=1
|
||||
|
||||
if [[ -n $LONGTERM ]];then
|
||||
if [[ $KERNEL_URI =~ ^(.*)(kernel/v3.0/patch)(.*)$ ]];then
|
||||
KERNEL_URI="${BASH_REMATCH[1]}kernel/v3.0/longterm/v${CKV}/patch${BASH_REMATCH[3]}"
|
||||
fi
|
||||
fi
|
||||
|
||||
calculate-kernel-5_pkg_setup() {
|
||||
kernel-2_pkg_setup
|
||||
eqawarn "!!! WARNING !!! WARNING !!! WARNING !!! WARNING !!!"
|
||||
eqawarn "After the kernel assemble perform command to update modules:"
|
||||
eqawarn " emerge @module-rebuild"
|
||||
}
|
||||
|
||||
calculate-kernel-5_src_unpack() {
|
||||
kernel-2_src_unpack
|
||||
}
|
||||
|
||||
vmlinuz_src_compile() {
|
||||
# disable sandbox
|
||||
export SANDBOX_ON=0
|
||||
export LDFLAGS=""
|
||||
local GENTOOARCH="${ARCH}"
|
||||
unset ARCH
|
||||
|
||||
cd ${S}
|
||||
DEFAULT_KERNEL_SOURCE="${S}" CMD_KERNEL_DIR="${S}" cl-kernel \
|
||||
--ebuild \
|
||||
-o \
|
||||
${CL_KERNEL_OPTS} \
|
||||
--kerneldir=${S} \
|
||||
--set cl_kernel_cache_path=${WORKDIR}/cache \
|
||||
--set cl_kernel_temp_path=${S}/temp \
|
||||
--set cl_kernel_install_path=${WORKDIR} \
|
||||
|| die "kernel build failed"
|
||||
|
||||
[ -f .config ] && cp .config .config.save
|
||||
make distclean &>/dev/null || die "cannot perform distclean"
|
||||
mv .config.save .config
|
||||
ARCH="${GENTOOARCH}"
|
||||
|
||||
rm ${WORKDIR}/lib/modules/${KV_FULL}/build
|
||||
rm ${WORKDIR}/lib/modules/${KV_FULL}/source
|
||||
}
|
||||
|
||||
calculate-kernel-5_src_compile() {
|
||||
use vmlinuz && vmlinuz_src_compile
|
||||
}
|
||||
|
||||
vmlinuz_src_install() {
|
||||
cd ${WORKDIR}/lib
|
||||
insinto /lib
|
||||
doins -r modules
|
||||
insinto /usr/share/${PN}/${PV}
|
||||
doins -r firmware
|
||||
cd ${WORKDIR}
|
||||
doins -r boot
|
||||
|
||||
dosym /usr/src/linux-${KV_FULL} \
|
||||
"/lib/modules/${KV_FULL}/source" ||
|
||||
die "cannot install source symlink"
|
||||
dosym /usr/src/linux-${KV_FULL} \
|
||||
"/lib/modules/${KV_FULL}/build" ||
|
||||
die "cannot install build symlink"
|
||||
insinto /etc/modprobe.d
|
||||
}
|
||||
|
||||
calculate-kernel-5_src_install() {
|
||||
if use minimal
|
||||
then
|
||||
local GENTOOARCH="${ARCH}"
|
||||
unset ARCH
|
||||
ebegin "kernel: >> Running modules_prepare..."
|
||||
make modules_prepare &>/dev/null
|
||||
eend $? "Failed modules prepare"
|
||||
ARCH="${GENTOOARCH}"
|
||||
|
||||
einfo "Cleaning sources"
|
||||
for rmpath in $(ls arch | grep -v x86)
|
||||
do
|
||||
rm -r arch/$rmpath
|
||||
done
|
||||
KEEPLIST="scripts/Makefile.lib scripts/module-common.lds \
|
||||
scripts/gcc-version.sh scripts/Makefile.help \
|
||||
scripts/Makefile.modinst scripts/Makefile.asm-generic \
|
||||
scripts/Makefile.modbuiltin scripts/Makefile.fwinst \
|
||||
scripts/depmod.sh scripts/Makefile.host \
|
||||
scripts/Kbuild.include scripts/Makefile.modpost \
|
||||
scripts/gcc-goto.sh scripts/Makefile.headersinst \
|
||||
scripts/Makefile.build scripts/basic/fixdep \
|
||||
scripts/Makefile.clean scripts/mod/modpost \
|
||||
include/config/kernel.release include/config/auto.conf \
|
||||
arch/x86/Makefile_32.cpu arch/x86/Makefile \
|
||||
System.map Makefile Kbuild"
|
||||
find . -type f -a \! -wholename ./.config \
|
||||
$(echo $KEEPLIST | sed -r 's/(\S+)(\s|$)/-a \! -wholename .\/\1 /g') \
|
||||
-a \! -name "*.h" -delete
|
||||
find . -type l -delete
|
||||
rm -r drivers
|
||||
rm -r Documentation
|
||||
fi
|
||||
kernel-2_src_install
|
||||
dodir /usr/share/${PN}/${PV}/boot
|
||||
use vmlinuz && vmlinuz_src_install
|
||||
if ! use vmlinuz
|
||||
then
|
||||
cp .config ${D}/usr/share/${PN}/${PV}/boot/config-${KV_FULL}
|
||||
fi
|
||||
}
|
||||
|
||||
vmlinuz_pkg_postinst() {
|
||||
cp -p /usr/share/${PN}/${PV}/boot/* ${ROOT}/boot/
|
||||
cl-kernel --ebuild \
|
||||
-k /usr/src/linux-${KV_FULL} \
|
||||
--set cl_kernel_install_path=${ROOT}/
|
||||
|
||||
mkdir -p ${ROOT}/lib/firmware
|
||||
cp -a ${ROOT}/usr/share/${PN}/${PV}/firmware/* ${ROOT}/lib/firmware/
|
||||
calculate_update_depmod
|
||||
calculate_update_modules
|
||||
|
||||
[[ -f $MODULESDBFILE ]] &&
|
||||
sed -ri 's/a:1:sys-fs\/aufs2/a:0:sys-fs\/aufs2/' $MODULESDBFILE
|
||||
}
|
||||
|
||||
calculate-kernel-5_pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
|
||||
KV_OUT_DIR=${ROOT}/usr/src/linux-${KV_FULL}
|
||||
if ls /usr/share/${PN}/${PV}/boot/ | grep -q System.map
|
||||
then
|
||||
cp -p /usr/share/${PN}/${PV}/boot/System.map* ${KV_OUT_DIR}/System.map
|
||||
fi
|
||||
cp -p /usr/share/${PN}/${PV}/boot/config* ${KV_OUT_DIR}/.config
|
||||
cd ${KV_OUT_DIR}
|
||||
|
||||
if ! use minimal
|
||||
then
|
||||
local GENTOOARCH="${ARCH}"
|
||||
unset ARCH
|
||||
ebegin "kernel: >> Running modules_prepare..."
|
||||
(make oldconfig && make modules_prepare) &>/dev/null
|
||||
eend $? "Failed modules prepare"
|
||||
ARCH="${GENTOOARCH}"
|
||||
fi
|
||||
|
||||
use vmlinuz && vmlinuz_pkg_postinst
|
||||
use vmlinuz && calculate_fix_lib_modules_contents
|
||||
}
|
@ -1,7 +1,2 @@
|
||||
AUX cndrvcups-capt-init.d 658 RMD160 ff3118b872a07252b68576008949deb601417201 SHA1 3708529d6dce7507c33b8049429716f81b326354 SHA256 d682e2a266e8b03b2eda7d22dc7ff522c58f69b2262bb7b01b91e441fac6b362
|
||||
DIST CAPT_Printer_Driver_for_Linux_V200_uk_EN.tar.gz 24605162 RMD160 1808f62dea97ab2df629dbce83e05b52636fb5f6 SHA1 443b9d7f89a567a6859c46d283360fb26aa9979d SHA256 8504ae9a2fe1f8413d9e6aa15fa34d4b289b514a7a2de13da8efb4ace9d541bb
|
||||
DIST CAPT_Printer_Driver_for_Linux_V220_uk_EN.tar.gz 34571533 RMD160 d25955287c9dd5982e6e7ad090d977a35f7e6af4 SHA1 eb10c74e58ac463fc6ca969cfc78c077f0ed5a19 SHA256 608e9735618fd11bd62fec159b133a93f56dc10184e26784fd1ffd1e6b314e68
|
||||
EBUILD cndrvcups-capt-2.00-r2.ebuild 4874 RMD160 4359f4f25e078055530466de9741b58e411284aa SHA1 2e9cb8f557522701b442270019395fd6daa91ad2 SHA256 e23aaebe7c00daa800f9a3567631d377ef0bcebb0e543d6d6e7192acc0ed1b03
|
||||
EBUILD cndrvcups-capt-2.20-r1.ebuild 5625 RMD160 d8acc8f38c41013611f8c64d6aea9d0f36ea798a SHA1 3b7f4b8b47a2b1ea9277063fe1192f0cc2a93ca2 SHA256 61327b104a4b4cbfdda92da07fe991f32b81214dea171a18d2fb35688c62e856
|
||||
MISC ChangeLog 639 RMD160 dc2522df24071a063d73f387e57ae6dec3719c87 SHA1 936c6f989aedf092c7d0778d5747db42987e0d03 SHA256 11f2ef2a816f4bc455b38fbbce64866e0ec9489086ce50696fd2ef75447232ed
|
||||
MISC metadata.xml 261 RMD160 fd6c87fa63054c379e842b826f994dce900bb013 SHA1 471683d4ccc2d0934e4f154b51de1be0435f508b SHA256 c4a2402d01197b6c1a7476c5b2b1ec7552b4acbc7dd51c7d775c4100c6324c8d
|
||||
DIST CAPT_Printer_Driver_for_Linux_V200_uk_EN.tar.gz 24605162 SHA256 8504ae9a2fe1f8413d9e6aa15fa34d4b289b514a7a2de13da8efb4ace9d541bb
|
||||
DIST CAPT_Printer_Driver_for_Linux_V220_uk_EN.tar.gz 34571533 SHA256 608e9735618fd11bd62fec159b133a93f56dc10184e26784fd1ffd1e6b314e68
|
||||
|
@ -1,6 +1,2 @@
|
||||
DIST CAPT_Printer_Driver_for_Linux_V200_uk_EN.tar.gz 24605162 RMD160 1808f62dea97ab2df629dbce83e05b52636fb5f6 SHA1 443b9d7f89a567a6859c46d283360fb26aa9979d SHA256 8504ae9a2fe1f8413d9e6aa15fa34d4b289b514a7a2de13da8efb4ace9d541bb
|
||||
DIST o1113enx_l_ufr220.zip 32622341 RMD160 56fb65b81e84740e6322e296402ec6e55fa40d83 SHA1 48803bef1820c9cf67d2c5f22dad354787d44d37 SHA256 c7d38c4fa0c3af5914767500f484b59afd5da71d0aa9c453de03d2a025fb21d8
|
||||
EBUILD cndrvcups-common-2.00-r2.ebuild 2394 RMD160 370337f70e6fe43b1f857b5d35632098c72ac344 SHA1 9cd7dcb2eb9e6ab414de8cbe6ac6af9a93eb7168 SHA256 85d3b3472544fb77b16779ad4d70edc2c988c7b794deb69e87fedfa197b2c9c6
|
||||
EBUILD cndrvcups-common-2.20-r1.ebuild 2251 RMD160 7688dfa9dcd75ad3182960649ead00d1ac51432d SHA1 14f6fdc6c96f468eeb53d061d1a3c73d2f36eaa2 SHA256 3406ddcb0f041c701d555d0f43072b9ecf9766bec8e45a84b492f0c70f2dc0ec
|
||||
MISC ChangeLog 414 RMD160 dc4a73273626a6c7d8773452d30099d2e98cec6e SHA1 4b41cd49b3abd846fe668ac428e22ce936fe5a9d SHA256 58345d4879a88b98b13f3355a3e0fd18c28ca8a6451d7828ba0c0912207d0822
|
||||
MISC metadata.xml 261 RMD160 fd6c87fa63054c379e842b826f994dce900bb013 SHA1 471683d4ccc2d0934e4f154b51de1be0435f508b SHA256 c4a2402d01197b6c1a7476c5b2b1ec7552b4acbc7dd51c7d775c4100c6324c8d
|
||||
DIST CAPT_Printer_Driver_for_Linux_V200_uk_EN.tar.gz 24605162 SHA256 8504ae9a2fe1f8413d9e6aa15fa34d4b289b514a7a2de13da8efb4ace9d541bb
|
||||
DIST o1113enx_l_ufr220.zip 32622341 SHA256 c7d38c4fa0c3af5914767500f484b59afd5da71d0aa9c453de03d2a025fb21d8
|
||||
|
@ -1,4 +1 @@
|
||||
DIST o1113enx_l_ufr220.zip 32622341 RMD160 56fb65b81e84740e6322e296402ec6e55fa40d83 SHA1 48803bef1820c9cf67d2c5f22dad354787d44d37 SHA256 c7d38c4fa0c3af5914767500f484b59afd5da71d0aa9c453de03d2a025fb21d8
|
||||
EBUILD cndrvcups-lb-2.20-r1.ebuild 1532 RMD160 dda3950f0d3fca768aebca4ba93862c44ae43b99 SHA1 b1d2d31e2bfc6368769493661786f8e22a85e224 SHA256 3af9333e952640c539f27211dfb0caf0bf8d41c63044f4ed1e74f9abc94a4fd3
|
||||
MISC ChangeLog 271 RMD160 55c2c0d183bf57a1ddff420be519841b8cac1edf SHA1 78292aa686c12df24cc631a38f98e8eee6704671 SHA256 dd89e56cf1e69393e02625cbc8002ab7f0d1a608e956c8c0e496c83c18b68e61
|
||||
MISC metadata.xml 252 RMD160 0eb548bc91f3378854c74a2723ec3c8b38bec522 SHA1 90276b091ca0e02243052b80454df13795e50bba SHA256 2bd10548884ee038f2928f30a97189b56ff4e721b0ee1396e63871be900dfb1a
|
||||
DIST o1113enx_l_ufr220.zip 32622341 SHA256 c7d38c4fa0c3af5914767500f484b59afd5da71d0aa9c453de03d2a025fb21d8
|
||||
|
@ -1 +0,0 @@
|
||||
EBUILD squidguard-shallalist-9999.ebuild 1530 RMD160 a642444b1c047d354baddc4f1d19037bbd86456d SHA1 829cea33f67b4832831a8ecc7fb0e1758e14e007 SHA256 108a41c28cd0ddd8951c187fcb0a79560eaacaee043a0a92d0ad361e3bb2eb27
|
@ -1,4 +0,0 @@
|
||||
AUX blueman-9999-plugins-conf-file.patch 1083 SHA256 a97c052b107beaf1c6615f47809ce08c5bd2c0cb1d2096f61f47c3bdb25af654 SHA512 4500b68061fda3672f2261d8035acbd6a3623d5c3d6836a6e06fb3c4c81f8143fc1ad14ee3109fb159aef8e980f494593fdc3a904294d17309d9ad2e0d6ce0b5 WHIRLPOOL b9d5f52a35ec6fd2cfef9b06ff98b3834946412859b30d187f598c883eb8ad235276f60b6cc3cc507c456fd753467f354dc47fd70bf717cce6983d0406920b5c
|
||||
AUX blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 8717 SHA256 91f6351614a8bdbb51155399f77c384a86407deb609c9e7bb61ffac17a56d81d SHA512 524afc7729564b5355f38648840b783426cf5aeaffd1bf157f725100b780d35b7524bc81144d3453e34683ea9f7af6982176d45b4488c8176c10224f74452f4d WHIRLPOOL ed053972b26a018276c221a51893bc0b1ab7b2b15e3900905444cfce03a41dd5eade845cd3e4ce3511ebf724e5a1c4e9dbd1f5024518ad8834fa2779bd1253a1
|
||||
DIST blueman_12f2a79922b5e69821bd13be61c0f0998f9aaea3.zip 1102843 SHA256 590d62a4814b47b7da04c72b327068871bcf44b392bfa49e071e42a98ae342f7 SHA512 edff8f5c2ad9e660382f7f74489817d8e3891738ff3caa929afcf1a94bbdb7b5bf1b2cc9e76a3986e43a125105f120d7d8efe67ceb36ad30ae2d52c967a177b7 WHIRLPOOL d9f5386605ae8f03764441032a329be10a01fee95e9dafbd691b8255586d443f7481f1b994ccd4ef6ef334b56937761f5d74ec19141571511476aeb3ae3f1e59
|
||||
EBUILD blueman-1.23_p20140627.ebuild 2578 SHA256 beef4a73ceb0a7f086310f9b70e0934cb164567327dd5ebed4ba9f91b867a32b SHA512 93918beadd531213cb4fffe805b20df778ecfb6320e19bee3b2dbbbfa114779098a646de38bee3c0cee118097b5381e315e2154b0c70fc1a1dfe64ca693cbc3f WHIRLPOOL d11ebe6dcd7db0ee94a297b28bfd6b2ad656400dee4e2e916c8ba703d60bff79073736a35709be86c71b6f11a3daf548b4bcb10acfab3bad1f60cbd45f4a5f81
|
@ -1,104 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.2 2014/05/12 14:22:17 zerochaos Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
|
||||
inherit eutils python gnome2-utils autotools
|
||||
MY_PV="12f2a79922b5e69821bd13be61c0f0998f9aaea3"
|
||||
|
||||
DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks."
|
||||
HOMEPAGE="http://blueman-project.org/"
|
||||
|
||||
SRC_URI="https://github.com/${PN}-project/${PN}/archive/${MY_PV}.zip -> ${PN}_${MY_PV}.zip"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
IUSE="gconf sendto network nls policykit pulseaudio"
|
||||
|
||||
CDEPEND="dev-libs/glib:2
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/startup-notification
|
||||
dev-python/pygobject:2
|
||||
>=net-wireless/bluez-4.61
|
||||
x11-libs/libnotify"
|
||||
DEPEND="${CDEPEND}
|
||||
nls? ( dev-util/intltool sys-devel/gettext )
|
||||
virtual/pkgconfig
|
||||
>=dev-python/pyrex-0.9.8"
|
||||
RDEPEND="${CDEPEND}
|
||||
>=app-mobilephone/obex-data-server-0.4.4
|
||||
sys-apps/dbus
|
||||
dev-python/pygtk
|
||||
dev-python/notify-python
|
||||
dev-python/dbus-python
|
||||
x11-themes/hicolor-icon-theme
|
||||
gconf? ( dev-python/gconf-python )
|
||||
sendto? ( gnome-base/nautilus )
|
||||
network? ( || ( net-dns/dnsmasq
|
||||
=net-misc/dhcp-3*
|
||||
>=net-misc/networkmanager-0.8 ) )
|
||||
policykit? ( sys-auth/polkit )
|
||||
pulseaudio? ( media-sound/pulseaudio )"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2.7
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# disable pyc compiling
|
||||
ln -sf $(type -P true) py-compile
|
||||
|
||||
sed -i \
|
||||
-e '/^Encoding/d' \
|
||||
data/blueman-manager.desktop.in || die "sed failed"
|
||||
|
||||
epatch \
|
||||
"${FILESDIR}/${PN}-9999-plugins-conf-file.patch" \
|
||||
"${FILESDIR}/${PN}-9999-set-codeset-for-gettext-to-UTF-8-always.patch"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-static \
|
||||
$(use_enable policykit polkit) \
|
||||
$(use_enable sendto) \
|
||||
--disable-hal \
|
||||
$(use_enable nls)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
python_convert_shebangs 2.7 "${D}"/usr/bin/blueman-* "${D}/usr/libexec/blueman-mechanism"
|
||||
|
||||
rm "${D}"/$(python_get_sitedir)/*.la
|
||||
use sendto && rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la
|
||||
|
||||
use gconf || rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py
|
||||
use policykit || rm -rf "${D}"/usr/share/polkit-1
|
||||
use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py}
|
||||
|
||||
python_need_rebuild
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
python_mod_optimize ${PN}
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup ${PN}
|
||||
gnome2_icon_cache_update
|
||||
}
|
@ -1,30 +0,0 @@
|
||||
diff --git a/blueman/plugins/config/File.py b/blueman/plugins/config/File.py
|
||||
index 3beccb4..c17fe77 100644
|
||||
--- a/blueman/plugins/config/File.py
|
||||
+++ b/blueman/plugins/config/File.py
|
||||
@@ -22,7 +22,12 @@ signal.signal(signal.SIGHUP, sighandler)
|
||||
|
||||
dbus.service.Object.SUPPORTS_MULTIPLE_OBJECT_PATHS = True
|
||||
|
||||
-cfg_path = os.path.expanduser('~/.config/blueman/blueman.cfg')
|
||||
+cfg_dir = os.path.expanduser('~/.config/blueman')
|
||||
+
|
||||
+if os.environ.has_key('XDG_CONFIG_HOME'):
|
||||
+ cfg_dir = '%s/blueman' % os.environ['XDG_CONFIG_HOME']
|
||||
+
|
||||
+cfg_path = '%s/blueman.cfg' % cfg_dir
|
||||
|
||||
|
||||
class Monitor(dbus.service.Object):
|
||||
@@ -77,9 +82,9 @@ class File(ConfigPlugin):
|
||||
def on_load(self, section):
|
||||
|
||||
if not File.__db__:
|
||||
- if not os.path.exists(os.path.expanduser('~/.config/blueman')):
|
||||
+ if not os.path.exists(os.path.expanduser(cfg_dir)):
|
||||
try:
|
||||
- os.makedirs(os.path.expanduser('~/.config/blueman'))
|
||||
+ os.makedirs(os.path.expanduser(cfg_dir))
|
||||
except:
|
||||
pass
|
||||
try:
|
@ -1,241 +0,0 @@
|
||||
diff --git a/apps/blueman-adapters b/apps/blueman-adapters
|
||||
index e6f1b16..95f6997 100755
|
||||
--- a/apps/blueman-adapters
|
||||
+++ b/apps/blueman-adapters
|
||||
@@ -6,6 +6,7 @@ from gi.repository import Pango
|
||||
import os.path
|
||||
import sys
|
||||
import signal
|
||||
+from locale import bind_textdomain_codeset
|
||||
|
||||
#support running uninstalled
|
||||
_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
|
||||
@@ -34,6 +35,7 @@ class BluemanAdapters:
|
||||
|
||||
builder = Gtk.Builder()
|
||||
builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
builder.add_from_file(UI_PATH + "/adapters.ui")
|
||||
self.dialog = builder.get_object("dialog")
|
||||
|
||||
diff --git a/apps/blueman-assistant b/apps/blueman-assistant
|
||||
index dc7f18f..47893da 100755
|
||||
--- a/apps/blueman-assistant
|
||||
+++ b/apps/blueman-assistant
|
||||
@@ -16,6 +16,7 @@ import random
|
||||
import signal
|
||||
import dbus.glib
|
||||
from optparse import OptionParser
|
||||
+from locale import bind_textdomain_codeset
|
||||
|
||||
#support running uninstalled
|
||||
_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
|
||||
@@ -63,6 +64,7 @@ class Assistant(Agent):
|
||||
|
||||
self.Builder = Gtk.Builder()
|
||||
self.Builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
self.Builder.add_from_file(UI_PATH + "/assistant.ui")
|
||||
self.assistant = self.Builder.get_object("assistant")
|
||||
self.assistant.set_title(_("Bluetooth Assistant"))
|
||||
diff --git a/apps/blueman-manager b/apps/blueman-manager
|
||||
index f31d219..e938601 100755
|
||||
--- a/apps/blueman-manager
|
||||
+++ b/apps/blueman-manager
|
||||
@@ -27,6 +27,7 @@ import dbus, dbus.glib
|
||||
from blueman.Constants import *
|
||||
import gi
|
||||
gi.require_version("Gtk", "3.0")
|
||||
+from locale import bind_textdomain_codeset
|
||||
from gi.repository import Gtk
|
||||
from gi.repository import GObject
|
||||
from blueman.bluez.BlueZInterface import BlueZInterface
|
||||
@@ -62,6 +64,7 @@ class Blueman:
|
||||
|
||||
self.Builder = Gtk.Builder()
|
||||
self.Builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
self.Builder.add_from_file(UI_PATH + "/manager-main.ui")
|
||||
|
||||
self.window = self.Builder.get_object("window")
|
||||
diff --git a/apps/blueman-sendto b/apps/blueman-sendto
|
||||
index e72e6ab..ce25926 100755
|
||||
--- a/apps/blueman-sendto
|
||||
+++ b/apps/blueman-sendto
|
||||
@@ -13,6 +13,7 @@ from optparse import OptionParser
|
||||
import gettext
|
||||
import urllib
|
||||
import time
|
||||
+from locale import bind_textdomain_codeset
|
||||
|
||||
from blueman.Constants import *
|
||||
import gi
|
||||
@@ -46,6 +47,7 @@ class Sender(GObject.GObject):
|
||||
GObject.GObject.__init__(self)
|
||||
self.Builder = Gtk.Builder()
|
||||
self.Builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
self.Builder.add_from_file(UI_PATH + "/send-dialog.ui")
|
||||
self.window = self.Builder.get_object("window")
|
||||
|
||||
diff --git a/apps/blueman-services b/apps/blueman-services
|
||||
index 25a529b..4b4419c 100755
|
||||
--- a/apps/blueman-services
|
||||
+++ b/apps/blueman-services
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
import os
|
||||
import sys
|
||||
+from locale import bind_textdomain_codeset
|
||||
#support running uninstalled
|
||||
_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
|
||||
if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
|
||||
@@ -29,6 +30,7 @@ class BluemanServices:
|
||||
|
||||
self.Builder = Gtk.Builder()
|
||||
self.Builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
self.Builder.add_from_file(UI_PATH + "/services.ui")
|
||||
|
||||
self.Config = Config()
|
||||
diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py
|
||||
index ee07e62..e58277b 100644
|
||||
--- a/blueman/gui/GsmSettings.py
|
||||
+++ b/blueman/gui/GsmSettings.py
|
||||
@@ -21,6 +21,7 @@ from blueman.Functions import *
|
||||
from blueman.Constants import *
|
||||
|
||||
from gi.repository import Gtk
|
||||
+from locale import bind_textdomain_codeset
|
||||
|
||||
class GsmSettings(Gtk.Dialog):
|
||||
def __init__(self, bd_address):
|
||||
@@ -30,6 +31,7 @@ class GsmSettings(Gtk.Dialog):
|
||||
|
||||
self.Builder = Gtk.Builder()
|
||||
self.Builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
self.Builder.add_from_file(UI_PATH +"/gsm-settings.ui")
|
||||
|
||||
vbox = self.Builder.get_object("vbox1")
|
||||
diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py
|
||||
index f994cc9..84d6370 100644
|
||||
--- a/blueman/gui/applet/PluginDialog.py
|
||||
+++ b/blueman/gui/applet/PluginDialog.py
|
||||
@@ -23,6 +23,7 @@ from blueman.Functions import *
|
||||
|
||||
from blueman.gui.GenericList import GenericList
|
||||
import weakref
|
||||
+from locale import bind_textdomain_codeset
|
||||
|
||||
class SettingsWidget(Gtk.VBox):
|
||||
def __init__(self, inst):
|
||||
@@ -118,6 +119,7 @@ class PluginDialog(Gtk.Dialog):
|
||||
|
||||
self.Builder = Gtk.Builder()
|
||||
self.Builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
self.Builder.add_from_file(UI_PATH +"/applet-plugins-widget.ui")
|
||||
|
||||
self.set_title(_("Plugins"))
|
||||
diff --git a/blueman/main/applet/BluezAgent.py b/blueman/main/applet/BluezAgent.py
|
||||
index 868dbe9..403077a 100644
|
||||
--- a/blueman/main/applet/BluezAgent.py
|
||||
+++ b/blueman/main/applet/BluezAgent.py
|
||||
@@ -25,6 +25,7 @@ from gi.repository import Gtk
|
||||
from gi.repository import GObject
|
||||
from gi.types import GObjectMeta
|
||||
import cgi
|
||||
+from locale import bind_textdomain_codeset
|
||||
import blueman.bluez as Bluez
|
||||
from blueman.Sdp import *
|
||||
from blueman.Constants import *
|
||||
@@ -68,6 +69,7 @@ class CommonAgent(GObject.GObject, Agent):
|
||||
editable.stop_emission("insert-text")
|
||||
|
||||
builder = Gtk.Builder()
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
builder.add_from_file(UI_PATH + "/applet-passkey.ui")
|
||||
builder.set_translation_domain("blueman")
|
||||
dialog = builder.get_object("dialog")
|
||||
diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
|
||||
index 1584580..6262ff0 100644
|
||||
--- a/blueman/plugins/applet/NetUsage.py
|
||||
+++ b/blueman/plugins/applet/NetUsage.py
|
||||
@@ -33,7 +33,7 @@ import dbus
|
||||
import time
|
||||
import datetime
|
||||
import gettext
|
||||
-
|
||||
+from locale import bind_textdomain_codeset
|
||||
|
||||
class MonitorBase(GObject.GObject):
|
||||
__gsignals__ = {
|
||||
@@ -150,6 +150,7 @@ class Dialog:
|
||||
builder = Gtk.Builder()
|
||||
builder.add_from_file(UI_PATH + "/net-usage.ui")
|
||||
builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
|
||||
self.dialog = builder.get_object("dialog")
|
||||
self.dialog.connect("response", self.on_response)
|
||||
diff --git a/blueman/plugins/services/Audio.py b/blueman/plugins/services/Audio.py
|
||||
index b44d6b5..4b13e8f 100644
|
||||
--- a/blueman/plugins/services/Audio.py
|
||||
+++ b/blueman/plugins/services/Audio.py
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
from gi.repository import Gtk
|
||||
import dbus
|
||||
+from locale import bind_textdomain_codeset
|
||||
from blueman.Constants import *
|
||||
from blueman.plugins.ServicePlugin import ServicePlugin
|
||||
|
||||
@@ -35,6 +36,7 @@ class Audio(ServicePlugin):
|
||||
|
||||
self.Builder = Gtk.Builder()
|
||||
self.Builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
self.Builder.add_from_file(UI_PATH +"/services-audio.ui")
|
||||
self.widget = self.Builder.get_object("audio")
|
||||
|
||||
diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py
|
||||
index e003345..bd705d9 100644
|
||||
--- a/blueman/plugins/services/Network.py
|
||||
+++ b/blueman/plugins/services/Network.py
|
||||
@@ -18,6 +18,7 @@
|
||||
#
|
||||
|
||||
from gi.repository import Gtk
|
||||
+from locale import bind_textdomain_codeset
|
||||
from blueman.Constants import *
|
||||
from blueman.Functions import have, dprint, mask_ip4_address
|
||||
from blueman.Lib import get_net_interfaces, get_net_address, get_net_netmask
|
||||
@@ -36,6 +37,7 @@ class Network(ServicePlugin):
|
||||
|
||||
self.Builder = Gtk.Builder()
|
||||
self.Builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
self.Builder.add_from_file(UI_PATH +"/services-network.ui")
|
||||
self.widget = self.Builder.get_object("network")
|
||||
|
||||
diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py
|
||||
index 55024d3..ffd75ec 100644
|
||||
--- a/blueman/plugins/services/Transfer.py
|
||||
+++ b/blueman/plugins/services/Transfer.py
|
||||
@@ -18,6 +18,7 @@
|
||||
#
|
||||
|
||||
from gi.repository import Gtk
|
||||
+from locale import bind_textdomain_codeset
|
||||
from blueman.Constants import *
|
||||
from blueman.plugins.ServicePlugin import ServicePlugin
|
||||
|
||||
@@ -32,6 +33,7 @@ class Transfer(ServicePlugin):
|
||||
|
||||
self.Builder = Gtk.Builder()
|
||||
self.Builder.set_translation_domain("blueman")
|
||||
+ bind_textdomain_codeset("blueman", "UTF-8")
|
||||
self.Builder.add_from_file(UI_PATH +"/services-transfer.ui")
|
||||
self.widget = self.Builder.get_object("transfer")
|
||||
|
@ -1,9 +0,0 @@
|
||||
EBUILD calculate-utilities-2.2.32-r6.ebuild 675 SHA256 ad5c020a54fc0107ff95cdc23aea81f94b89759522e172673e12b58622dbbae9 SHA512 990c05be06538a7e4ed475b748f865e64e0d2b705db00494f22bce7d84595a95d2d78ab5981b0e40b8f7ea0efa8ce285ed0e0125ad92b6c0a0033f85f1f39c60 WHIRLPOOL a979abab285a8b264476680ad75188cc5d272ebd47c0712b39f9cd153cb317421fb87cbbea96671eb6ec31da4e140e2443be9a5b67b27d11d95f2a7168557cc9
|
||||
EBUILD calculate-utilities-2.2.9999.ebuild 831 SHA256 630a2373531bdbda2cac289c82332b3688d57d00b403795b93f68cce36824265 SHA512 cf7553e27cd0772548f746d97ab90093c2aa945e34273aa29df222727684451b6ceadda577e2ac0af943a61f84871286d1505ee3682020437a449542f2750255 WHIRLPOOL c48a8b8d9b64ebd3e32105cfad5b86db16373e3ab90e2fc50c7d2cf8908840ea91ba7a32c537a6406feb1f37d03a21619e0b1e33f1ef11a1047c21a6393d0284
|
||||
EBUILD calculate-utilities-3.2.0-r2.ebuild 758 SHA256 ad7de322882e45b1398f47195f1516432f087862f7d43fc8f737fdccdb8b1e3f SHA512 1d17d53754f3ee3474332bbb82e8df9a156d0ab146a37a5f138d8be3246f40f14d77ede5c98b9993b76234bd12135992da29b8de574cb38ec6067da9d392cbd6 WHIRLPOOL 24ac09b4935c05dda5142e938b233f8786969aeb62acda9e0b007c5e7900115a2c2d5f0019fe0aea3175fe287bc93713f30ae0153a604abc11acf80d889a5cac
|
||||
EBUILD calculate-utilities-3.2.0-r3.ebuild 761 SHA256 585bc0cbde7f83d857042b123575da16afa3ff0df91d3a89cbfa6d8d47b06648 SHA512 8db074e4cfcaa21440fa3090dc5c3a21ae40f819fe38613dc9f369bd71bccb288da2e980302a60426846a8575814460156d317ed46ec93e2453a73df46df01bc WHIRLPOOL 5d66ece1e64af3cb4fc2ed5eab8aac80145b5823ec8670399f069bfaecd5e8f2132d65d880e8aba5a37f7db036404a6d0ca27be2ccdb8c183a59d5532a98f0ee
|
||||
EBUILD calculate-utilities-3.2.0-r4.ebuild 767 SHA256 a91294ec25ec1f3762cd3e55d3ae3d52520b88a46a353871c3cc46d78f2e321e SHA512 deccabb804808ba75780e5499559580eaa75835faa8555816937e0c1e2b56eceeb152ed6e063f8ff95187565a60bbd3195820387f7162426a9437bbbf6c0c4f6 WHIRLPOOL e89816e05a4552ff260516d10bfbb415ce521059618c00ff735094baf98ed38cbb8f9375ae39e7db4e72171fc390fc052fdb7eaa3352d99e1e1e516d6883a95f
|
||||
EBUILD calculate-utilities-3.2.0-r5.ebuild 770 SHA256 e0cbae9dbb44ec71bce2b756cf1fa447cf550e6b3de7c2bb4e6e58d1ff0b7b3c SHA512 d1ca00bde22ed8d69759280f9268c1f51ea123ccd4c4b051d759063af2107b2163ef3047c67df2a004ee3476c4a769fa9c94591670974c34b7e63ce9b75ec985 WHIRLPOOL 9744bfd647e992e33ea41c7423a6e2bffc86be00543af4101c89cc478310169c56cb797c4041d86c2ba87041e2c6b18d017ae7ce51754b4089908ff9f2f63f6d
|
||||
EBUILD calculate-utilities-3.2.0-r6.ebuild 770 SHA256 b5d882313c78b0a4a09461d8afde40e8c39a0f953779db02311ca658aee233c4 SHA512 5191c03639e07cd606591e61bff82594454708ee1fe2c05c8ed203e329c533b180aa0d919a68c56b7fe074f7d174d2df27df272346acbff1717a49c8a010e3f5 WHIRLPOOL eff90c7323ca2f6223b5405e27adf8b3e94b3d109fd490b599ac3b4e1aeb046a65949adcc8409d8f7b494563b1312a7de59642c3033191e035ff5fc4c72523ec
|
||||
EBUILD calculate-utilities-3.2.9999.ebuild 800 SHA256 acbb7a4e34387baa1ade9bf97637972fbfc97afa56367381d622198b5237e983 SHA512 9e0c74eb499157b6d3ace20d7e9da630660e46b74a6d575e222e1638c87f85660635187489b9312a45f193780c301d87c1dbb9a0f60414e178e8f54080c71ffd WHIRLPOOL 9b56f590f36d29d3518c66c453f97b14d083e36b62adb70a8916ae4e30b527431602a9edd40d703e5cb4296a01f8c982157b602651ee57a9c0ddb7a4c6aa2fe1
|
||||
MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db
|
@ -1,4 +0,0 @@
|
||||
DIST tw_cli-freebsd-x86-9.5.3.tgz 793534 RMD160 6d34b5ca50f70f7f3850df17991bf0030f98fde7 SHA1 fb89de931c3d679a7f719559a809f382f0ee16cd SHA256 546e5193de8cdaa267c1b29643f64865ebba04796d2c741d0b37a053402bb6b5
|
||||
DIST tw_cli-linux-x86-9.5.3.tgz 958837 RMD160 2d11c686446145043ee742f878e217bfec1476cb SHA1 a4130a53c19761a6302b0ecf1289b6d05a67e22a SHA256 8330a18b782e383f518002e1d506e9298ce914609b8a37421156b4d633268127
|
||||
DIST tw_cli-linux-x86_64-9.5.3.tgz 986751 RMD160 9549816e190c76bc25715283a629d6ba6971c3f3 SHA1 14a64755e799df17e262c38d514b3f758dd37e4c SHA256 3fd481b69b3a90abafe32966bf30040db89c70836d9d9536f21e0ab641f64ce6
|
||||
EBUILD tw_cli-9.5.3.ebuild 3257 RMD160 272aed11c5e6ef06db8a3c4ebff3919527484d06 SHA1 73d21e48194db6a0e9baa96cd3318e40f44ae20a SHA256 2c5ea907d4beba177219f982e8f29b31252fd72baa496fae8344db45b09fbaa2
|
@ -1,102 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/tw_cli-9.5.2.ebuild,v 1.4 2009/09/23 20:33:29 patrick Exp $
|
||||
|
||||
DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
|
||||
HOMEPAGE="http://www.3ware.com/kb/article.aspx?id=14847"
|
||||
LICENSE="3ware"
|
||||
SLOT="0"
|
||||
# binary packages
|
||||
KEYWORDS="-* amd64 x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
# stripping seems to break this sometimes
|
||||
RESTRICT="strip"
|
||||
# binary packages
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
# Upstream has _FUN_ naming these
|
||||
# We are mostly prepared for the FreeBSD binaries at this point
|
||||
# They just aren't yet enabled here
|
||||
PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
|
||||
[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
|
||||
PN_ARCH="${ARCH/*-}"
|
||||
PN_ARCH="${PN_ARCH/amd64/x86_64}"
|
||||
|
||||
# The naming of <=9.5.0 for freebsd was weird,
|
||||
# but 9.5.0.1 has it sanely.
|
||||
MY_P="${PN}-${PN_KERNEL}-${PN_ARCH}-${PV}"
|
||||
|
||||
# Upstream actually only releases newer versions for new hardware
|
||||
# and doesn't release new major versions for old hardware
|
||||
# however their backwards compatibility is excellent.
|
||||
# I personally test tw_cli on 4 cards:
|
||||
# 7006-2 on x86.
|
||||
# 9500S-8 on amd64.
|
||||
# 9500S-4LP on amd64.
|
||||
# 9650SE-8LPML on amd64.
|
||||
# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
|
||||
#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
|
||||
#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
|
||||
HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
|
||||
# package has different tarballs for x86 and amd64
|
||||
SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
|
||||
SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
|
||||
SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
|
||||
SRC_URI_x86_fbsd="${SRC_URI_BASE}/${PN}-freebsd-x86-${PV}.tgz"
|
||||
#SRC_URI_amd64_fbsd="${SRC_URI_BASE}/${PN}-x86_64-freebsd-${PV}.tgz"
|
||||
SRC_URI="x86? ( ${SRC_URI_x86} )
|
||||
amd64? ( ${SRC_URI_amd64} )
|
||||
x86-fbsd? ( ${SRC_URI_x86_fbsd} )"
|
||||
#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
|
||||
LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${MY_P}.tgz
|
||||
}
|
||||
|
||||
supportedcards() {
|
||||
elog "This binary supports should support ALL cards, including, but not"
|
||||
elog "limited to the following series:"
|
||||
elog ""
|
||||
elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
|
||||
elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
|
||||
elog " 9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
|
||||
elog " 9690SA"
|
||||
elog ""
|
||||
elog "Release notes for this version are available at:"
|
||||
elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
supportedcards
|
||||
}
|
||||
|
||||
pkg_nofetch() {
|
||||
einfo "3ware would like you to agree to the license:"
|
||||
einfo ""
|
||||
einfo "\t${LICENSE_URL}"
|
||||
einfo ""
|
||||
einfo "And then use the following URL to download the"
|
||||
einfo "correct tarballs manually into ${DISTDIR}"
|
||||
einfo ""
|
||||
einfo "x86 - ${SRC_URI_x86}"
|
||||
einfo "amd64 - ${SRC_URI_amd64}"
|
||||
einfo "x86-fbsd - ${SRC_URI_x86_fbsd}"
|
||||
#einfo "amd64-fbsd - ${SRC_URI_amd64_fbsd}"
|
||||
einfo ""
|
||||
einfo "However, they have given permission to redistribute."
|
||||
einfo "http://bugs.gentoo.org/show_bug.cgi?id=60690#c106"
|
||||
einfo ""
|
||||
supportedcards
|
||||
}
|
||||
|
||||
src_install() {
|
||||
into /
|
||||
dosbin tw_cli
|
||||
into /usr
|
||||
newman tw_cli.8.nroff tw_cli.8
|
||||
dohtml *.html
|
||||
}
|
@ -1,40 +0,0 @@
|
||||
# ChangeLog for sys-boot/grub
|
||||
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
*grub-1.99-r3 (26 Jul 2011)
|
||||
|
||||
26 Jul 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
|
||||
+grub-1.99-r3.ebuild, +files/grub-1.99-lvm_mapper.patch:
|
||||
Add patch for lvm.
|
||||
|
||||
*grub-1.99-r2 (10 Jun 2011)
|
||||
|
||||
10 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
|
||||
+grub-1.99-r2.ebuild, files/grub-1.99-chroot.patch:
|
||||
Update for fix grub-install.
|
||||
|
||||
*grub-1.99-r1 (06 Jun 2011)
|
||||
|
||||
06 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
|
||||
+grub-1.99-r1.ebuild, files/grub-1.99-chroot.patch:
|
||||
Update for fix scratch install.
|
||||
|
||||
06 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
|
||||
files/grub-1.99-chroot.patch:
|
||||
Add scratch support.
|
||||
|
||||
02 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru> grub-1.99.ebuild:
|
||||
Discard postinst mkconfig.
|
||||
|
||||
02 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru> grub-1.99.ebuild,
|
||||
+files/grub-1.99-chroot.patch:
|
||||
Add ability CHROOT_PATH for grub-mkconfig. Fix GRUB_DISTRIBUTOR.
|
||||
|
||||
*grub-1.99 (01 Jun 2011)
|
||||
|
||||
01 Jun 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru> +grub-1.99.ebuild,
|
||||
+files/grub-1.99-genkernel.patch, +files/defaults, +files/grub.conf.gentoo,
|
||||
+metadata.xml:
|
||||
Transfer from portage for 1.99.
|
||||
|
@ -1,28 +0,0 @@
|
||||
AUX defaults 1019 SHA256 70031c9dd25afb304b5206d135292af0fe33f71e82b8bc49dae9264e177b8c40 SHA512 a11eb2225ca528b8c020c11edc54564063ab953f6f71115dcc72b0f65bf01da902f2e966b148660c07e45be3122d183e3f1abc206113d88fa4596a5420b54d1b WHIRLPOOL 083b86e03b8b32c2a1ca374e900d7df5fc2ab9d52c18694bdc1b0ed929aa59903eeee0f16f4bea7d4d588602934fb7d6d60bc86b1677cffba1f07dcdaa2f52a8
|
||||
AUX grub-1.99-chroot.patch 7430 SHA256 8dde001253e53bf9d8ad729f5b6241432900206cdd2ab17c43a8ee465ea9cf2e SHA512 97c48f2c3c67db429a20de4a00ffe2e28f2a4d607b01e1565175a2621f11e3485d7ed3e5969ab38fe03ce2bb3aa6af3920dde1a29a56a749eb6af61e4a4fe8f0 WHIRLPOOL 3a1f3209cc58f62c9cb8f6b68b523501c767e1dc0f95edb8a50089692182414f98a4c8f821e506a9b5638dd9c1d70c941839c679759d57f92e4d1170616e27da
|
||||
AUX grub-1.99-latest_version_backport.patch 3812 SHA256 1603015a438d5d4ac7ce5ec7d3804df26a51695cf4281ceb2092e584721fc393 SHA512 d879fb43999b81f11eb7c35dae3cba44dec54cbc688c5dd60dc5d88f378be3739b3b81abc5dfb1aef6ca831c30538e5dab3f94700751efdcdf53c0900730cae0 WHIRLPOOL d1c6dc61525895031dab0cd1e77500aba665e31754e8135c6ecd250310480bbc26234987786a1cadb74953320e9176ef37cf0e38e3f36d6b04b784c3e74c25f9
|
||||
AUX grub-1.99-lvm_mapper-r1.patch 2422 SHA256 4eacca556d8f4e4fbd96f5dfc90d9828f6e5ab519b50b11fa7e82740113275c5 SHA512 61c9895d9780424816ca24754ef86859b31e32a1d2ba37f2cfdca31fc631b43e7207286f41750187e59abcaf27ba7a139dec151366beb898a0254d01782c718e WHIRLPOOL e4396bf0d97ad7fb31a6f07b57c8456a2f76ccecd6c10834a9125767b5ff8738ce9e107d71e56098637620badc1b42782a327d5894208936a2cda19a2761cc53
|
||||
AUX grub-1.99-lvm_mapper.patch 1012 SHA256 828b25d9f58baf156240b4e3da7a8c8b8a9db74219115b70f200d4ee6f2ac819 SHA512 19b3bd617925f58255deae890887f8286061f30c2028aed2022f230b64375480a6d14427b6e3b1bebb044b3cfdb477d78f23434856f7f41ac0a5e509829923aa WHIRLPOOL 853aabe55e34e6730070456bc8de7c0d02c9a7412a6edd482e4c6c29b8c5139f439d6bb91e872164b555edd8faae46b5f61acb90a7f07b5814d73225c445ad90
|
||||
AUX grub-2.00-compression.patch 2051 SHA256 003cc6b8762adbff14c1d0f7a0c2ddb145e80d73e899439fb8ab12e133a60feb SHA512 2b57ddb395cb5aa37bc3d721f3d4c527a1d5165c0b5e1c2efec7d169ae2438ad063ee67da68eff4069f0451983e599ec40ed92a0bc33348a21ad622738bbc213 WHIRLPOOL 2c61bfd65ed1d53e42a1ec881f3a7e42904924097460f692952a0fbfa46cfbb029374a2e6cfdcb1f2eb1216e994b56265e6e0e72912ecda7de90daddc03931c2
|
||||
AUX grub-2.00-config-quoting.patch 3934 SHA256 4f1bc29429a864731edf4a5a5fa53004dc67bf1225bd8fa81cb58b197df12510 SHA512 bed0fb1a8589c1979cf7162599e041c8b8eaa66bff3e8fa4a8b9929c8e8191ec1f85c129bcf2f7c9dcc75d5ea50330067ffd519835308460f7a194aab40bfc13 WHIRLPOOL 979234f1d3e1282d1e6d3ac4aa1e01c86082a3883abd452f0f1886181a6d46ccccd8e6b59628acfa8dc375ad9db1b35037d9483f87df2893a7398402dc7cb51a
|
||||
AUX grub-2.00-freebsd.patch 16465 SHA256 5464dda43bed28634e406a3b182db1d76e70059e0a3b3c276ee91ff27ca78cbd SHA512 d0fecaf83796971ef6f2cd43cab4c89faf1496d4241e249467d7839b366c616e15a8c6961d9224ed0e139d018d5d9f354cf59ddf2ef5e915a4b03e11dbdf568e WHIRLPOOL 963c61923503a57894634f0b3431e8e701a83f6514e5829f0ed91fc3c9011fa39870c319e1cbfee62341f1d37dfd0fdadcd4a028b725bb65d2f06fbedfd31166
|
||||
AUX grub-2.00-hardcoded-awk.patch 599 SHA256 438c7357a632c7c9efe406b1d7cbb2524694e68c5783b401d3dd17ae0aba6816 SHA512 f47b742b9fa4c57e36e767ace6e14318678cc429ae88cd275e07d95abbc8d3d01d831058da2f6f91662bfdfc4396aed5417198245534488359a43023459d1a1f WHIRLPOOL 17be198f854466ff8a50c5b7d46eaf7883a4ce8cbe3a89cbc0e62d75ae71e94ce863341c0650b113bbee4415220da38896da73177ab59d2b53d3bde7ec9809ba
|
||||
AUX grub-2.00-no-gets.patch 805 SHA256 054d85619905055a0ea0e5f9d27eb8c8596959598ac9a5bae7e82543c19adeaf SHA512 8b89fa40efe232474e7bb03d12542030d40fea1fe0839a9493f6704fbe6de77516b5976841bf652c7236104513f427750efc668248c71ba0ea7f676557e8c9e3 WHIRLPOOL 796a7bc4583829abd1a552f7d16d6cc4f2999707af1ae0b5231fa53e87ce22a265a35a3d0f486fcac2e74dbed5fd54e3a572186cc2ba1a849433adc021a0a65b
|
||||
AUX grub-2.00-parallel-make.patch 1907 SHA256 7d8eda92eeeeb87001bc44dd1390b96c927c45542af2984c5d80f9ca3a552362 SHA512 cc2c47858ca2fa76b081ca78b6090fe61f0b41d6aad21f07e269dd9f98355b7c148f62659418257c24aa370634060ead2c3a612aae07c6f53e9ba13a25a1d7fc WHIRLPOOL 9b5aad7db3ec5c60151984861690b64e90d6adbeb1dec4257d33873156ae6ce6ded432377520cfb9cbbbbf2f30e69e134d6dbc0007355cfa74521042500d844e
|
||||
AUX grub-2.00-tftp-endian.patch 728 SHA256 4806fb14471fe6547cb69e6fab97e66c8245654acbc4738071cf2717368de458 SHA512 8fee95b06b50f8721d7013ecf8fb954e9b1ba83f99790e165ec334dfcd41fe7655f37868069a315acd4af97d3c4466aa36e0ab5a8b767faf862f1d71f88b3252 WHIRLPOOL 53779e4952049f069824eefcaaaa0e46fc9a7036ed0f9b67008e523f618105d760300ffcd315f861de786c63de02b2753d3ed14637b39fd7af47aadd02355695
|
||||
AUX grub-2.00-zfs-feature-flag-support.patch 31186 SHA256 596d509a22d1f3c2bf27864ff285d7ae8e39b3912347163a14afb36812de8605 SHA512 e262f33de0e3ef97c9bcfc294ba40638dd66b369a4a72bcee42c2d5aafa223eec96b1ed841b97c09b40db798dec38504397ad6000eb3b98eb8b29457e0dfefa3 WHIRLPOOL 70314defe1fc0704a2e3ff2579916a8a206b9437517096b3b1129991dd3364a994991f6bed0d5ace51b78c9ba469afeb4de88d445600783c91456a1278c9ac23
|
||||
AUX grub.conf.gentoo 627 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776 SHA512 5ee586c151b025a153867d2854b73e2e18a6af38e9d65069b7114a55af776803ba947b4901b0806e79fa8f36aeac90daad608b9ec2a4a8526301d1beb36e4ef3 WHIRLPOOL fcaef85cd7c2c446c882874cf4ec8a2241d1fc97720973a0a0cd1add259da599d4dae4d0b429ba2dff0307ed2d4598d5939cbc1b11127a0dedb3a54249ec9f81
|
||||
AUX grub.default-2 1470 SHA256 fcef668c1316a38f6a1c784c489c2052b23b8e2b79dc1a940b5bda831947af74 SHA512 5c331323ef17683fdfc59b0057a6e89a451039febc4ff6242c17cd3aeda0ef60930a79dc52e180bf534f94867a8b4545655808ae5a7362643542fea42b6a0d91 WHIRLPOOL 5f8a1192763ee9089e48a7eff13ef75947e7f4db20ff873ae86fd99920b107de827588558bdc26d2bf5ee3da4f51a44d53470aa65bf73ab565cf23e84097de5c
|
||||
DIST grub-1.99.tar.gz 4652619 SHA256 b91f420f2c51f6155e088e34ff99bea09cc1fb89585cf7c0179644e57abd28ff SHA512 673f33f86c6dafffb6801d2a625ac594839cc025cb63acfa2d66681b217306f7f90d76330a21f6672515a2bbc8812dbe4dd92441e6f1b2bca382e5e169277187 WHIRLPOOL fce61d615142f00cdea6aa06d80af442560f0b6b3d4afafbf5319c2b318a25fe566393afeef08c6f12c6b1e4e08055095a6897e92759e43dbd370e668bef6646
|
||||
DIST grub-2.00.tar.xz 5136412 SHA256 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458 SHA512 f0dbfc90639491e5c671d2df206dec0139171bf096a99ee236f7ebf21cdafc6e6d39a9607e14ad2a6aee7c199ecc63f0a39573d969318e1a0cd32f989aa6b44a WHIRLPOOL b9690c023ab507926b8615ce28bf9de82b793ebd02126a5ecd52a130ab4bc52e2ae650b02ae2d784d4089e2981be944ba8b4800cde742aab793ff0d9029843c8
|
||||
EBUILD grub-1.99-r1.ebuild 2797 SHA256 5256e478fc7a50b5df7b98900d7cc72bac82cc46681a235a44012809f7009bf8 SHA512 5a95409fa2839733e612c3bdb2c40104944ef605d5a98b8c7c495f0657de67b964a4f3219117a400a312cdc594d2abb419a265410bd14ce2149b70ea56bb3655 WHIRLPOOL b828fe74524048c60ee707735852d0d2a6ac93655d8db8890e89eeae587056007a65f08eeb61f6d9d1e53db71c29e8aed93d42d471facf1a50c894cac779a588
|
||||
EBUILD grub-1.99-r2.ebuild 2797 SHA256 5256e478fc7a50b5df7b98900d7cc72bac82cc46681a235a44012809f7009bf8 SHA512 5a95409fa2839733e612c3bdb2c40104944ef605d5a98b8c7c495f0657de67b964a4f3219117a400a312cdc594d2abb419a265410bd14ce2149b70ea56bb3655 WHIRLPOOL b828fe74524048c60ee707735852d0d2a6ac93655d8db8890e89eeae587056007a65f08eeb61f6d9d1e53db71c29e8aed93d42d471facf1a50c894cac779a588
|
||||
EBUILD grub-1.99-r3.ebuild 2860 SHA256 5200cfaa4956bfdb75f4386c38ea4f02f2439c549ea4a5676cfc67db06ed7359 SHA512 e81c45bd73ae8b3594adc236c51eba947212f78151a8f5dac8fc1a27ea5250213731982595d22084b95a3c015d8de4ab9f8541f36c9116b1cb2048baaf935c39 WHIRLPOOL c24355c3f92359fbe69b3352455790dc8970ed8a91641cf4241fc17db1211519a52e5f0a7c8a9d5b8f5a712e374896404c0f48fd7407d48e781906371f0af40c
|
||||
EBUILD grub-1.99-r4.ebuild 2863 SHA256 61097caa686d4ad465dc7b0f781dfed6ab9d4fa74898ccc5396871f68245777b SHA512 39dfd0ed40e367fcdec0b8c4829491bbe2baa8bedc622300176dbb11adcef3e46d64f029100cc835a2ec0182c796c989636e077a5e19d305496c6415c851f8a3 WHIRLPOOL e58672910a7cb767c65672e8dd304c2696bc6b6f935c7752bc269634a2406fe58afa8d9bb538cd43b31adb94abd718bd1db86ce6e6a13d202de4fd81d47702af
|
||||
EBUILD grub-1.99-r5.ebuild 2935 SHA256 717af30c0305eb0c89fe121528160810efcbadff987172cc34ce2018d5d182c1 SHA512 3866a64c1469056e9180b9362ef3e4c84e97b037cee63056411ccecc0c946556344302493ec08661e581d06b4669892d4b5d40c42da5f7b19a848068daf17fee WHIRLPOOL 2fed2d09041fdb2e987b3965749f9ef13dca95241d083897c10e8f9f420c82e7bba6f329aaf6738696c25ef0273987b55a9f979273849ff51caea2cf246a1f25
|
||||
EBUILD grub-1.99.ebuild 2797 SHA256 5256e478fc7a50b5df7b98900d7cc72bac82cc46681a235a44012809f7009bf8 SHA512 5a95409fa2839733e612c3bdb2c40104944ef605d5a98b8c7c495f0657de67b964a4f3219117a400a312cdc594d2abb419a265410bd14ce2149b70ea56bb3655 WHIRLPOOL b828fe74524048c60ee707735852d0d2a6ac93655d8db8890e89eeae587056007a65f08eeb61f6d9d1e53db71c29e8aed93d42d471facf1a50c894cac779a588
|
||||
EBUILD grub-2.00-r3.ebuild 9524 SHA256 5875eb10b124e29a263c7bd6fd57efca427e63d7d0b1d06c376d8863205e4688 SHA512 21a874ba38a6f5908de903eac86b29c92f4596e053f7d91ff58c371ca79ccd9da4a8946ac7cc6837a40848b02cd8886a61c45675cddff889b99f604c3548a233 WHIRLPOOL a7451ce152f61ab0bc21c6344084d5e0171b30220ff73c71c8594874a7f313db3703bf9c317bec3dcc94e3652ad9c59bd19e640ff727070a36387681049d935a
|
||||
EBUILD grub-2.00-r4.ebuild 9524 SHA256 5875eb10b124e29a263c7bd6fd57efca427e63d7d0b1d06c376d8863205e4688 SHA512 21a874ba38a6f5908de903eac86b29c92f4596e053f7d91ff58c371ca79ccd9da4a8946ac7cc6837a40848b02cd8886a61c45675cddff889b99f604c3548a233 WHIRLPOOL a7451ce152f61ab0bc21c6344084d5e0171b30220ff73c71c8594874a7f313db3703bf9c317bec3dcc94e3652ad9c59bd19e640ff727070a36387681049d935a
|
||||
EBUILD grub-2.00-r5.ebuild 9457 SHA256 87033de96aa2bf92aff923d466a9fd2afd246dda51fd45e74ff2e6f70dbe0db4 SHA512 c57199a9050aa695f9b41e023db60e608de19b6e4ec256d544815500b0beff9c70abd02a1abff98422c207612e1735ae75a80e5384aff5948824b4f861783bf3 WHIRLPOOL 9bc35bc2e4d7aadb922cdbafb1de9eb48bb344410af39b22490f15c33a55353cc0ccc1658d18992ac4bfc0a982eea24df94777e5e03ffded21694c8bc5490d94
|
||||
MISC ChangeLog 1275 SHA256 72979dcf1b9a759974c31e423b30b72c6c70c31ed0e37cab7bd3bcc7293acff7 SHA512 6464c2e7ea5f8b645cd98b7325cb2ecbbd05ea4afd85909d40d5b1cbcd27fc2983194bee0b95248b6d2261f650e365afe8f888a25171927dd291dd0814043ae6 WHIRLPOOL caaf41d9abc9df6b0fde8a212d0bdae30989b65f74834cc277b542320e48601065878cd2052f61feb9e08d1d4c4d2c2d2da5de0a7aeaf6b5c79c0948a81e6f94
|
||||
MISC metadata.xml 349 SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9 SHA512 00ea2ff785a2de7aab609ec1997a397c5dc1dec103a84b0d7768aedb0e06de2ba81d719c0ae603c068d626f2238dd4f518cc8abdd2eb0cb8a0c1c05da28f85fb WHIRLPOOL 11b1eea531604cae84dff299c944b73a3567b112d94413772744865ba4176e20447a94197065912a4c7559791664af3bac2c9ba2ddc790ecda4607fdff5467c6
|
@ -1,30 +0,0 @@
|
||||
# /etc/default/grub
|
||||
# If you change this file, run 'grub-mkconfig -o /boot/grub/grub.cfg'
|
||||
# afterwords to update /boot/grub/grub.cfg. Make sure your /boot is
|
||||
# mounted rw before executing this command.
|
||||
#
|
||||
# See the grub info page for documentation on possible variables and
|
||||
# their associated values. This wiki also has random bits of info:
|
||||
# http://en.gentoo-wiki.com/wiki/Grub2#Using_variables
|
||||
|
||||
GRUB_DEFAULT=0
|
||||
GRUB_HIDDEN_TIMEOUT=0
|
||||
GRUB_HIDDEN_TIMEOUT_QUIET=true
|
||||
GRUB_TIMEOUT=10
|
||||
|
||||
GRUB_CMDLINE_LINUX_DEFAULT=""
|
||||
GRUB_CMDLINE_LINUX=""
|
||||
|
||||
# Uncomment to disable graphical terminal (grub-pc only)
|
||||
#GRUB_TERMINAL=console
|
||||
|
||||
# The resolution used on graphical terminal
|
||||
# note that you can use only modes which your graphic card supports via VBE
|
||||
# you can see them in real GRUB with the command `vbeinfo'
|
||||
#GRUB_GFXMODE=640x480
|
||||
|
||||
# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
|
||||
#GRUB_DISABLE_LINUX_UUID=true
|
||||
|
||||
# Uncomment to disable generation of recovery mode menu entrys
|
||||
#GRUB_DISABLE_RECOVERY=true
|
@ -1,170 +0,0 @@
|
||||
commit 4626a651d0aeeafb24d84f5c622cca25843f4dcd
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Fri Jun 10 11:17:34 2011 +0400
|
||||
|
||||
Add CHROOT_PATH ability. Add sync before grub_setup.
|
||||
|
||||
diff --git a/util/grub-install.in b/util/grub-install.in
|
||||
index ff8bea8..16236ba 100644
|
||||
--- a/util/grub-install.in
|
||||
+++ b/util/grub-install.in
|
||||
@@ -580,6 +580,8 @@ fi
|
||||
|
||||
# Perform the platform-dependent install
|
||||
if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
|
||||
+ # sync filesystem before grub_setup
|
||||
+ sync
|
||||
# Now perform the installation.
|
||||
"$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}" \
|
||||
--device-map="${device_map}" "${install_device}" || exit 1
|
||||
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||
index afc66f8..1586ad7 100644
|
||||
--- a/util/grub-mkconfig.in
|
||||
+++ b/util/grub-mkconfig.in
|
||||
@@ -141,19 +141,19 @@ if test -e ${GRUB_PREFIX}/device.map ; then : ; else
|
||||
fi
|
||||
|
||||
# Device containing our userland. Typically used for root= parameter.
|
||||
-GRUB_DEVICE="`${grub_probe} --target=device /`"
|
||||
+GRUB_DEVICE="`${grub_probe} --target=device /${CHROOT_PATH#/}`"
|
||||
GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
|
||||
|
||||
# Device containing our /boot partition. Usually the same as GRUB_DEVICE.
|
||||
-GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
|
||||
+GRUB_DEVICE_BOOT="`${grub_probe} --target=device ${CHROOT_PATH%/}/boot`"
|
||||
GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
|
||||
|
||||
# Filesystem for the device containing our userland. Used for stuff like
|
||||
# choosing Hurd filesystem module.
|
||||
GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
|
||||
|
||||
-if test -f ${sysconfdir}/default/grub ; then
|
||||
- . ${sysconfdir}/default/grub
|
||||
+if test -f ${CHROOT_PATH}${sysconfdir}/default/grub ; then
|
||||
+ . ${CHROOT_PATH}${sysconfdir}/default/grub
|
||||
fi
|
||||
|
||||
# XXX: should this be deprecated at some point?
|
||||
@@ -171,7 +171,7 @@ fi
|
||||
for x in ${GRUB_TERMINAL_OUTPUT}; do
|
||||
if [ "x${x}" = "xgfxterm" ]; then
|
||||
if [ -n "$GRUB_FONT" ] ; then
|
||||
- if is_path_readable_by_grub ${GRUB_FONT} > /dev/null ; then
|
||||
+ if is_path_readable_by_grub ${CHROOT_PATH%/}${GRUB_FONT} > /dev/null ; then
|
||||
GRUB_FONT_PATH=${GRUB_FONT}
|
||||
else
|
||||
echo "No such font or not readable by grub: ${GRUB_FONT}" >&2
|
||||
@@ -181,7 +181,7 @@ for x in ${GRUB_TERMINAL_OUTPUT}; do
|
||||
for dir in ${pkgdatadir} ${GRUB_PREFIX} /usr/share/grub ; do
|
||||
for basename in unicode unifont ascii; do
|
||||
path="${dir}/${basename}.pf2"
|
||||
- if is_path_readable_by_grub ${path} > /dev/null ; then
|
||||
+ if is_path_readable_by_grub ${CHROOT_PATH%/}${path} > /dev/null ; then
|
||||
GRUB_FONT_PATH=${path}
|
||||
else
|
||||
continue
|
||||
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
||||
index 9da1511..5d54f1c 100644
|
||||
--- a/util/grub.d/00_header.in
|
||||
+++ b/util/grub.d/00_header.in
|
||||
@@ -125,7 +125,7 @@ fi
|
||||
|
||||
if [ "x$gfxterm" = x1 ]; then
|
||||
# Make the font accessible
|
||||
- prepare_grub_to_access_device `${grub_probe} --target=device "${GRUB_FONT_PATH}"`
|
||||
+ prepare_grub_to_access_device `${grub_probe} --target=device "${CHROOT_PATH%/}${GRUB_FONT_PATH}"`
|
||||
|
||||
cat << EOF
|
||||
if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT_PATH}"` ; then
|
||||
@@ -136,7 +136,7 @@ EOF
|
||||
|
||||
# Gettext variables and module
|
||||
if [ "x${LANG}" != "xC" ] && [ -d "${locale_dir}" ] ; then
|
||||
- prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir}) | sed -e "s/^/ /"
|
||||
+ prepare_grub_to_access_device $(${grub_probe} --target=device ${CHROOT_PATH%/}${locale_dir}) | sed -e "s/^/ /"
|
||||
cat << EOF
|
||||
set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})
|
||||
set lang=${grub_lang}
|
||||
@@ -175,7 +175,7 @@ if [ "x$gfxterm" = x1 ]; then
|
||||
if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
|
||||
&& is_path_readable_by_grub "$GRUB_THEME"; then
|
||||
echo "Found theme: $GRUB_THEME" >&2
|
||||
- prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"`
|
||||
+ prepare_grub_to_access_device `${grub_probe} --target=device "${CHROOT_PATH%/}$GRUB_THEME"`
|
||||
cat << EOF
|
||||
insmod gfxmenu
|
||||
EOF
|
||||
@@ -206,8 +206,8 @@ EOF
|
||||
cat << EOF
|
||||
set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
|
||||
EOF
|
||||
- elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
|
||||
- && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
|
||||
+ elif [ "x${CHROOT_PATH}$GRUB_BACKGROUND" != x ] && [ -f "${CHROOT_PATH%/}$GRUB_BACKGROUND" ] \
|
||||
+ && is_path_readable_by_grub "${CHROOT_PATH%/}$GRUB_BACKGROUND"; then
|
||||
echo "Found background: $GRUB_BACKGROUND" >&2
|
||||
case "$GRUB_BACKGROUND" in
|
||||
*.png) reader=png ;;
|
||||
@@ -215,7 +215,7 @@ EOF
|
||||
*.jpg|*.jpeg) reader=jpeg ;;
|
||||
*) echo "Unsupported image format" >&2; exit 1 ;;
|
||||
esac
|
||||
- prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"`
|
||||
+ prepare_grub_to_access_device `${grub_probe} --target=device "${CHROOT_PATH%/}$GRUB_BACKGROUND"`
|
||||
cat << EOF
|
||||
insmod $reader
|
||||
background_image -m stretch `make_system_path_relative_to_its_root "$GRUB_BACKGROUND"`
|
||||
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
index 1d1eb40..505aac6 100644
|
||||
--- a/util/grub.d/10_linux.in
|
||||
+++ b/util/grub.d/10_linux.in
|
||||
@@ -31,7 +31,7 @@ CLASS="--class gnu-linux --class gnu --class os"
|
||||
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
||||
OS=GNU/Linux
|
||||
else
|
||||
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
||||
+ OS="${GRUB_DISTRIBUTOR}"
|
||||
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
|
||||
fi
|
||||
|
||||
@@ -132,12 +132,18 @@ EOF
|
||||
|
||||
case x`uname -m` in
|
||||
xi?86 | xx86_64)
|
||||
- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
|
||||
- if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
||||
+ list=`for i in ${CHROOT_PATH%/}/boot/vmlinuz-* \
|
||||
+ ${CHROOT_PATH%/}/vmlinuz-* \
|
||||
+ ${CHROOT_PATH%/}/boot/kernel-* ; do
|
||||
+ if grub_file_is_not_garbage "$i" && ! [[ -L $i ]] ; then echo -n "$i " ; fi
|
||||
done` ;;
|
||||
*)
|
||||
- list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
|
||||
- if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
||||
+ list=`for i in ${CHROOT_PATH%/}/boot/vmlinuz-* \
|
||||
+ ${CHROOT_PATH%/}/boot/vmlinux-* \
|
||||
+ ${CHROOT_PATH%/}/vmlinuz-* \
|
||||
+ ${CHROOT_PATH%/}/vmlinux-* \
|
||||
+ ${CHROOT_PATH%/}/boot/kernel-* ; do
|
||||
+ if grub_file_is_not_garbage "$i" && ! [[ -L $i ]] ; then echo -n "$i " ; fi
|
||||
done` ;;
|
||||
esac
|
||||
|
||||
@@ -150,6 +156,7 @@ while [ "x$list" != "x" ] ; do
|
||||
basename=`basename $linux`
|
||||
dirname=`dirname $linux`
|
||||
rel_dirname=`make_system_path_relative_to_its_root $dirname`
|
||||
+ rel_dirname=${rel_dirname#/workspace}
|
||||
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
|
||||
alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
||||
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
||||
@@ -160,7 +167,8 @@ while [ "x$list" != "x" ] ; do
|
||||
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
||||
"initramfs-genkernel-${version}" \
|
||||
- "initramfs-genkernel-${alt_version}"; do
|
||||
+ "initramfs-genkernel-${alt_version}" \
|
||||
+ "initramfs-${version}"; do
|
||||
if test -e "${dirname}/${i}" ; then
|
||||
initrd="$i"
|
||||
break
|
@ -1,123 +0,0 @@
|
||||
commit 59e1b06096de9ec9443fa15951e1dd816ecd7dde
|
||||
Author: Хирецкий Михаил <mh@calculate.ru>
|
||||
Date: Fri Apr 6 10:20:13 2012 +0400
|
||||
|
||||
Add support -install initramfs using.
|
||||
|
||||
Backport get latest version from grub-2.0.
|
||||
|
||||
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
|
||||
index a2dcd20..ddfbf70 100644
|
||||
--- a/util/grub-mkconfig_lib.in
|
||||
+++ b/util/grub-mkconfig_lib.in
|
||||
@@ -157,23 +157,41 @@ grub_file_is_not_garbage ()
|
||||
return 0
|
||||
}
|
||||
|
||||
+version_sort ()
|
||||
+{
|
||||
+ case $version_sort_sort_has_v in
|
||||
+ yes)
|
||||
+ LC_ALL=C sort -V;;
|
||||
+ no)
|
||||
+ LC_ALL=C sort -n;;
|
||||
+ *)
|
||||
+ if sort -V </dev/null > /dev/null 2>&1; then
|
||||
+ version_sort_sort_has_v=yes
|
||||
+ LC_ALL=C sort -V
|
||||
+ else
|
||||
+ version_sort_sort_has_v=no
|
||||
+ LC_ALL=C sort -n
|
||||
+ fi;;
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
version_test_numeric ()
|
||||
{
|
||||
- local a="$1"
|
||||
- local cmp="$2"
|
||||
- local b="$3"
|
||||
- if [ "$a" = "$b" ] ; then
|
||||
- case "$cmp" in
|
||||
+ version_test_numeric_a="$1"
|
||||
+ version_test_numeric_cmp="$2"
|
||||
+ version_test_numeric_b="$3"
|
||||
+ if [ "$version_test_numeric_a" = "$version_test_numeric_b" ] ; then
|
||||
+ case "$version_test_numeric_cmp" in
|
||||
ge|eq|le) return 0 ;;
|
||||
gt|lt) return 1 ;;
|
||||
esac
|
||||
fi
|
||||
- if [ "$cmp" = "lt" ] ; then
|
||||
- c="$a"
|
||||
- a="$b"
|
||||
- b="$c"
|
||||
+ if [ "$version_test_numeric_cmp" = "lt" ] ; then
|
||||
+ version_test_numeric_c="$version_test_numeric_a"
|
||||
+ version_test_numeric_a="$version_test_numeric_b"
|
||||
+ version_test_numeric_b="$version_test_numeric_c"
|
||||
fi
|
||||
- if (echo "$a" ; echo "$b") | sort -n | head -n 1 | grep -qx "$b" ; then
|
||||
+ if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
@@ -182,32 +200,31 @@ version_test_numeric ()
|
||||
|
||||
version_test_gt ()
|
||||
{
|
||||
- local a="`echo "$1" | sed -e "s/[^-]*-//"`"
|
||||
- local b="`echo "$2" | sed -e "s/[^-]*-//"`"
|
||||
- local cmp=gt
|
||||
- if [ "x$b" = "x" ] ; then
|
||||
+ version_test_gt_a="`echo "$1" | sed -e "s/[^-]*-//"`"
|
||||
+ version_test_gt_b="`echo "$2" | sed -e "s/[^-]*-//"`"
|
||||
+ version_test_gt_cmp=gt
|
||||
+ if [ "x$version_test_gt_b" = "x" ] ; then
|
||||
return 0
|
||||
fi
|
||||
- case "$a:$b" in
|
||||
+ case "$version_test_gt_a:$version_test_gt_b" in
|
||||
*.old:*.old) ;;
|
||||
- *.old:*) a="`echo -n "$a" | sed -e 's/\.old$//'`" ; cmp=gt ;;
|
||||
- *:*.old) b="`echo -n "$b" | sed -e 's/\.old$//'`" ; cmp=ge ;;
|
||||
+ *.old:*) version_test_gt_a="`echo -n "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;;
|
||||
+ *:*.old) version_test_gt_b="`echo -n "$version_test_gt_b" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=ge ;;
|
||||
esac
|
||||
- version_test_numeric "$a" "$cmp" "$b"
|
||||
+ version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
|
||||
return "$?"
|
||||
}
|
||||
|
||||
version_find_latest ()
|
||||
{
|
||||
- local a=""
|
||||
+ version_find_latest_a=""
|
||||
for i in "$@" ; do
|
||||
- if version_test_gt "$i" "$a" ; then
|
||||
- a="$i"
|
||||
+ if version_test_gt "$i" "$version_find_latest_a" ; then
|
||||
+ version_find_latest_a="$i"
|
||||
fi
|
||||
done
|
||||
- echo "$a"
|
||||
+ echo "$version_find_latest_a"
|
||||
}
|
||||
-
|
||||
# One layer of quotation is eaten by "", the second by sed, and the third by
|
||||
# printf; so this turns ' into \'. Note that you must use the output of
|
||||
# this function in a printf format string.
|
||||
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
index 505aac6..9aa7270 100644
|
||||
--- a/util/grub.d/10_linux.in
|
||||
+++ b/util/grub.d/10_linux.in
|
||||
@@ -168,7 +168,8 @@ while [ "x$list" != "x" ] ; do
|
||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
||||
"initramfs-genkernel-${version}" \
|
||||
"initramfs-genkernel-${alt_version}" \
|
||||
- "initramfs-${version}"; do
|
||||
+ "initramfs-${version}" \
|
||||
+ "initramfs-${version}-install"; do
|
||||
if test -e "${dirname}/${i}" ; then
|
||||
initrd="$i"
|
||||
break
|
@ -1,61 +0,0 @@
|
||||
commit ef471478e4b8950a3312ffc736113f9b9e8946f2
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Tue Jul 26 18:20:55 2011 +0400
|
||||
|
||||
Fix detect filesystem for lvm.
|
||||
|
||||
Fix readable_by_grub, prepare_grub_access_device for LVM. Fix
|
||||
grub-install.
|
||||
|
||||
Sometimes program cann't determine fs for device by path /dev/mapper.
|
||||
For resolve the problem filesystem for that devices determined by device
|
||||
to which they point. (readlink -f)
|
||||
|
||||
diff --git util/grub-install.in util/grub-install.in
|
||||
index 16236ba..8cf86be 100644
|
||||
--- util/grub-install.in
|
||||
+++ util/grub-install.in
|
||||
@@ -465,6 +465,11 @@ fi
|
||||
|
||||
# Create the core image. First, auto-detect the filesystem module.
|
||||
fs_module="`"$grub_probe" --device-map="${device_map}" --target=fs --device "${grub_device}"`"
|
||||
+# sometimes filesystem on LVM (place in /dev/mapper) is not detected. Try detect by /dev/dm-X
|
||||
+if test "x$fs_module" = x ; then
|
||||
+ grub_device_fs=$(readlink -f ${grub_device})
|
||||
+ fs_module="`"$grub_probe" --device-map="${device_map}" --target=fs --device "${grub_device_fs}"`"
|
||||
+fi
|
||||
if test "x$fs_module" = x ; then
|
||||
echo "Auto-detection of a filesystem of ${grub_device} failed." 1>&2
|
||||
echo "Try with --recheck." 1>&2
|
||||
diff --git util/grub-mkconfig_lib.in util/grub-mkconfig_lib.in
|
||||
index 2c5fd8c..a2dcd20 100644
|
||||
--- util/grub-mkconfig_lib.in
|
||||
+++ util/grub-mkconfig_lib.in
|
||||
@@ -58,7 +58,11 @@ is_path_readable_by_grub ()
|
||||
|
||||
# abort if file is in a filesystem we can't read
|
||||
if "${grub_probe}" -t fs "$path" > /dev/null 2>&1 ; then : ; else
|
||||
- return 1
|
||||
+ # sometimes filesystem on LVM (place in /dev/mapper) is not detected. Try detect by /dev/dm-X
|
||||
+ fsdevice=`readlink -f $(${grub_probe} -t device "$path" 2>/dev/null)`
|
||||
+ if "${grub_probe}" -t fs -d "${fsdevice}" > /dev/null 2>&1 ; then : ; else
|
||||
+ return 1
|
||||
+ fi
|
||||
fi
|
||||
|
||||
# ... or if we can't figure out the abstraction module, for example if
|
||||
@@ -121,7 +125,13 @@ prepare_grub_to_access_device ()
|
||||
esac
|
||||
done
|
||||
|
||||
- fs="`"${grub_probe}" --device "${device}" --target=fs`"
|
||||
+ # sometimes filesystem on LVM (place in /dev/mapper) is not detected. Try detect by /dev/dm-X
|
||||
+ if "${grub_probe}" --device "${device}" --target=fs >/dev/null 2>/dev/null; then
|
||||
+ device_fs="${device}"
|
||||
+ else
|
||||
+ device_fs=`readlink -f "${device}"`
|
||||
+ fi
|
||||
+ fs="`"${grub_probe}" --device "${device_fs}" --target=fs`"
|
||||
for module in ${fs} ; do
|
||||
echo "insmod ${module}"
|
||||
done
|
@ -1,21 +0,0 @@
|
||||
commit d0868853121fa1110949125e9015caae16325d03
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Tue Jul 26 18:20:55 2011 +0400
|
||||
|
||||
Fix detect filesystem for lvm.
|
||||
|
||||
diff --git a/util/grub-install.in b/util/grub-install.in
|
||||
index 16236ba..7ebbb50 100644
|
||||
--- a/util/grub-install.in
|
||||
+++ b/util/grub-install.in
|
||||
@@ -466,6 +466,10 @@ fi
|
||||
# Create the core image. First, auto-detect the filesystem module.
|
||||
fs_module="`"$grub_probe" --device-map="${device_map}" --target=fs --device "${grub_device}"`"
|
||||
if test "x$fs_module" = x ; then
|
||||
+ grub_device_fs=$(readlink -f ${grub_device})
|
||||
+ fs_module="`"$grub_probe" --device-map="${device_map}" --target=fs --device "${grub_device_fs}"`"
|
||||
+fi
|
||||
+if test "x$fs_module" = x ; then
|
||||
echo "Auto-detection of a filesystem of ${grub_device} failed." 1>&2
|
||||
echo "Try with --recheck." 1>&2
|
||||
echo "If the problem persists please report this together with the output of \"$grub_probe --device-map=\"${device_map}\" --target=fs -v ${grubdir}\" to <bug-grub@gnu.org>" 1>&2
|
@ -1,84 +0,0 @@
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=424527
|
||||
https://savannah.gnu.org/bugs/index.php?36770
|
||||
|
||||
=== modified file 'grub-core/lib/xzembed/xz_dec_stream.c'
|
||||
--- grub-core/lib/xzembed/xz_dec_stream.c 2012-02-29 13:56:51 +0000
|
||||
+++ grub-core/lib/xzembed/xz_dec_stream.c 2012-07-22 14:27:03 +0000
|
||||
@@ -403,18 +403,25 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
- do {
|
||||
+ if (b->in_pos == b->in_size)
|
||||
+ return XZ_OK;
|
||||
+
|
||||
+ if (!crc32 && s->hash_size == 0)
|
||||
+ s->pos += 8;
|
||||
+
|
||||
+ while (s->pos < (crc32 ? 32 : s->hash_size * 8)) {
|
||||
if (b->in_pos == b->in_size)
|
||||
return XZ_OK;
|
||||
|
||||
#ifndef GRUB_EMBED_DECOMPRESSOR
|
||||
- if (hash && s->hash_value[s->pos / 8] != b->in[b->in_pos++])
|
||||
+ if (hash && s->hash_value[s->pos / 8] != b->in[b->in_pos])
|
||||
return XZ_DATA_ERROR;
|
||||
#endif
|
||||
+ b->in_pos++;
|
||||
|
||||
s->pos += 8;
|
||||
|
||||
- } while (s->pos < (crc32 ? 32 : s->hash_size * 8));
|
||||
+ }
|
||||
|
||||
#ifndef GRUB_EMBED_DECOMPRESSOR
|
||||
if (s->hash)
|
||||
@@ -529,8 +536,6 @@
|
||||
s->hash->init(s->index.hash.hash_context);
|
||||
s->hash->init(s->block.hash.hash_context);
|
||||
}
|
||||
- if (!s->hash)
|
||||
- return XZ_OPTIONS_ERROR;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
|
||||
=== modified file 'grub-core/normal/autofs.c'
|
||||
--- grub-core/normal/autofs.c 2012-05-01 13:26:36 +0000
|
||||
+++ grub-core/normal/autofs.c 2012-07-22 14:23:46 +0000
|
||||
@@ -32,11 +32,21 @@
|
||||
autoload_fs_module (void)
|
||||
{
|
||||
grub_named_list_t p;
|
||||
+ int ret = 0;
|
||||
+ grub_file_filter_t grub_file_filters_was[GRUB_FILE_FILTER_MAX];
|
||||
+
|
||||
+ grub_memcpy (grub_file_filters_was, grub_file_filters_enabled,
|
||||
+ sizeof (grub_file_filters_enabled));
|
||||
+ grub_memcpy (grub_file_filters_enabled, grub_file_filters_all,
|
||||
+ sizeof (grub_file_filters_enabled));
|
||||
|
||||
while ((p = fs_module_list) != NULL)
|
||||
{
|
||||
if (! grub_dl_get (p->name) && grub_dl_load (p->name))
|
||||
- return 1;
|
||||
+ {
|
||||
+ ret = 1;
|
||||
+ break;
|
||||
+ }
|
||||
|
||||
if (grub_errno)
|
||||
grub_print_error ();
|
||||
@@ -46,7 +56,10 @@
|
||||
grub_free (p);
|
||||
}
|
||||
|
||||
- return 0;
|
||||
+ grub_memcpy (grub_file_filters_enabled, grub_file_filters_was,
|
||||
+ sizeof (grub_file_filters_enabled));
|
||||
+
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
/* Read the file fs.lst for auto-loading. */
|
||||
|
@ -1,113 +0,0 @@
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=426364
|
||||
https://savannah.gnu.org/bugs/index.php?36839
|
||||
--- util/grub-mkconfig_lib.in
|
||||
+++ util/grub-mkconfig_lib.in
|
||||
@@ -255,19 +255,19 @@
|
||||
echo "$version_find_latest_a"
|
||||
}
|
||||
|
||||
-# One layer of quotation is eaten by "", the second by sed, and the third by
|
||||
-# printf; so this turns ' into \'. Note that you must use the output of
|
||||
+# One layer of quotation is eaten by "" and the second by
|
||||
+# sed; so this turns ' into \'. Note that you must use the output of
|
||||
# this function in a printf format string.
|
||||
|
||||
grub_quote () {
|
||||
- sed "s/'/'\\\\\\\\''/g"
|
||||
+ sed "s/'/'\\\\''/g"
|
||||
}
|
||||
|
||||
gettext_quoted () {
|
||||
- gettext "$@" | sed "s/'/'\\\\\\\\''/g"
|
||||
+ gettext "$@" | grub_quote
|
||||
}
|
||||
|
||||
-# Run the first argument through gettext_quoted, and then pass that and all
|
||||
+# Run the first argument through gettext, and then pass that and all
|
||||
# remaining arguments to printf. This is a useful abbreviation and tends to
|
||||
# be easier to type.
|
||||
gettext_printf () {
|
||||
|
||||
=== modified file 'util/grub.d/10_hurd.in'
|
||||
--- util/grub.d/10_hurd.in
|
||||
+++ util/grub.d/10_hurd.in
|
||||
@@ -117,7 +117,7 @@
|
||||
opts=
|
||||
fi
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
- echo '$message'
|
||||
+ echo '$(echo "$message" | grub_quote)'
|
||||
multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/} $opts ${GRUB_CMDLINE_GNUMACH}
|
||||
EOF
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
fi
|
||||
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
- echo '$message'
|
||||
+ echo '$(echo "$message" | grub_quote)'
|
||||
module /hurd/${hurd_fs}.static ${hurd_fs} $opts \\
|
||||
--multiboot-command-line='\${kernel-command-line}' \\
|
||||
--host-priv-port='\${host-port}' \\
|
||||
--- util/grub.d/10_illumos.in
|
||||
+++ util/grub.d/10_illumos.in
|
||||
@@ -46,6 +46,7 @@
|
||||
ISADIR=
|
||||
fi
|
||||
zfs-bootfs $($grub_mkrelpath /) ZFS_BOOTFS
|
||||
+ echo '$(echo "$message" | grub_quote)'
|
||||
multiboot $($grub_mkrelpath /platform/i86pc/kernel)/\$ISADIR/unix /platform/i86pc/kernel/\$ISADIR/unix -B \$ZFS_BOOTFS,console=text
|
||||
module $($grub_mkrelpath /platform/i86pc)/\$ISADIR/boot_archive /platform/i86pc/\$ISADIR/boot_archive
|
||||
}
|
||||
--- util/grub.d/10_kfreebsd.in
|
||||
+++ util/grub.d/10_kfreebsd.in
|
||||
@@ -100,7 +100,7 @@
|
||||
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
||||
message="$(gettext_printf "Loading kernel of FreeBSD %s ..." ${version})"
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
- echo '$message'
|
||||
+ echo '$(echo "$message" | grub_quote)'
|
||||
kfreebsd ${rel_dirname}/${basename} ${args}
|
||||
EOF
|
||||
|
||||
--- util/grub.d/10_linux.in
|
||||
+++ util/grub.d/10_linux.in
|
||||
@@ -134,14 +134,14 @@
|
||||
fi
|
||||
message="$(gettext_printf "Loading Linux %s ..." ${version})"
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
- echo '$message'
|
||||
+ echo '$(echo "$message" | grub_quote)'
|
||||
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
|
||||
EOF
|
||||
if test -n "${initrd}" ; then
|
||||
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
||||
message="$(gettext_printf "Loading initial ramdisk ...")"
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
- echo '$message'
|
||||
+ echo '$(echo "$message" | grub_quote)'
|
||||
initrd ${rel_dirname}/${initrd}
|
||||
EOF
|
||||
fi
|
||||
--- util/grub.d/20_linux_xen.in
|
||||
+++ util/grub.d/20_linux_xen.in
|
||||
@@ -120,16 +120,16 @@
|
||||
xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
|
||||
lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
- echo '$xmessage'
|
||||
+ echo '$(echo "$xmessage" | grub_quote)'
|
||||
multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
|
||||
- echo '$lmessage'
|
||||
+ echo '$(echo "$lmessage" | grub_quote)'
|
||||
module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
|
||||
EOF
|
||||
if test -n "${initrd}" ; then
|
||||
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
||||
message="$(gettext_printf "Loading initial ramdisk ...")"
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
- echo '$message'
|
||||
+ echo '$(echo "$message" | grub_quote)'
|
||||
module ${rel_dirname}/${initrd}
|
||||
EOF
|
||||
fi
|
@ -1,382 +0,0 @@
|
||||
Taken from
|
||||
http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4556
|
||||
http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4584
|
||||
http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4624
|
||||
http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4625
|
||||
|
||||
diff -Nur grub-2.00.orig/grub-core/loader/i386/bsd.c grub-2.00/grub-core/loader/i386/bsd.c
|
||||
--- grub-2.00.orig/grub-core/loader/i386/bsd.c 2012-06-07 22:06:00.000000000 +0900
|
||||
+++ grub-2.00/grub-core/loader/i386/bsd.c 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -1309,7 +1309,7 @@
|
||||
&& phdr->p_type != PT_DYNAMIC)
|
||||
return 0;
|
||||
|
||||
- paddr = phdr->p_paddr & 0xFFFFFF;
|
||||
+ paddr = phdr->p_paddr & 0xFFFFFFF;
|
||||
|
||||
if (paddr < kern_start)
|
||||
kern_start = paddr;
|
||||
@@ -1333,7 +1333,7 @@
|
||||
}
|
||||
|
||||
*do_load = 1;
|
||||
- phdr->p_paddr &= 0xFFFFFF;
|
||||
+ phdr->p_paddr &= 0xFFFFFFF;
|
||||
paddr = phdr->p_paddr;
|
||||
|
||||
*addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
|
||||
@@ -1351,7 +1351,7 @@
|
||||
&& phdr->p_type != PT_DYNAMIC)
|
||||
return 0;
|
||||
|
||||
- paddr = phdr->p_paddr & 0xffffff;
|
||||
+ paddr = phdr->p_paddr & 0xfffffff;
|
||||
|
||||
if (paddr < kern_start)
|
||||
kern_start = paddr;
|
||||
@@ -1375,7 +1375,7 @@
|
||||
}
|
||||
|
||||
*do_load = 1;
|
||||
- paddr = phdr->p_paddr & 0xffffff;
|
||||
+ paddr = phdr->p_paddr & 0xfffffff;
|
||||
|
||||
*addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
|
||||
|
||||
@@ -1394,7 +1394,7 @@
|
||||
{
|
||||
grub_relocator_chunk_t ch;
|
||||
|
||||
- entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFF;
|
||||
+ entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFFF;
|
||||
err = grub_elf32_phdr_iterate (elf, filename,
|
||||
grub_bsd_elf32_size_hook, NULL);
|
||||
if (err)
|
||||
diff -Nur grub-2.00.orig/util/grub-mkconfig_lib.in grub-2.00/util/grub-mkconfig_lib.in
|
||||
--- grub-2.00.orig/util/grub-mkconfig_lib.in 2012-06-28 00:27:53.000000000 +0900
|
||||
+++ grub-2.00/util/grub-mkconfig_lib.in 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -349,3 +349,10 @@
|
||||
cat
|
||||
fi
|
||||
}
|
||||
+
|
||||
+grub_tab=" "
|
||||
+
|
||||
+grub_add_tab () {
|
||||
+ sed -e "s/^/$grub_tab/"
|
||||
+}
|
||||
+
|
||||
diff -Nur grub-2.00.orig/util/grub.d/10_hurd.in grub-2.00/util/grub.d/10_hurd.in
|
||||
--- grub-2.00.orig/util/grub.d/10_hurd.in 2012-03-05 05:10:04.000000000 +0900
|
||||
+++ grub-2.00/util/grub.d/10_hurd.in 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -108,7 +108,7 @@
|
||||
EOF
|
||||
fi
|
||||
|
||||
- prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"|sed "s/^/$submenu_indentation/"
|
||||
+ prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | grub_add_tab|sed "s/^/$submenu_indentation/"
|
||||
message="$(gettext_printf "Loading GNU Mach ...")"
|
||||
|
||||
if [ x$type = xrecovery ] ; then
|
||||
@@ -122,9 +122,9 @@
|
||||
EOF
|
||||
|
||||
if [ x$type != xrecovery ] ; then
|
||||
- save_default_entry | sed -e "s/^/\t/"| sed "s/^/$submenu_indentation/"
|
||||
+ save_default_entry | grub_add_tab| sed "s/^/$submenu_indentation/"
|
||||
fi
|
||||
- prepare_grub_to_access_device "${GRUB_DEVICE}" | sed -e "s/^/\t/"| sed "s/^/$submenu_indentation/"
|
||||
+ prepare_grub_to_access_device "${GRUB_DEVICE}" | grub_add_tab| sed "s/^/$submenu_indentation/"
|
||||
message="$(gettext_printf "Loading the Hurd ...")"
|
||||
if [ x$type = xrecovery ] ; then
|
||||
opts=
|
||||
@@ -158,7 +158,7 @@
|
||||
|
||||
if [ "x$is_first_entry" = xtrue ]; then
|
||||
hurd_entry "$kernel" simple
|
||||
- submenu_indentation="\t"
|
||||
+ submenu_indentation="$grub_tab"
|
||||
|
||||
# TRANSLATORS: %s is replaced with an OS name
|
||||
echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnuhurd-advanced-$(grub_get_device_id "${GRUB_DEVICE_BOOT}")' {"
|
||||
diff -Nur grub-2.00.orig/util/grub.d/10_illumos.in grub-2.00/util/grub.d/10_illumos.in
|
||||
--- grub-2.00.orig/util/grub.d/10_illumos.in 2012-03-05 04:03:38.000000000 +0900
|
||||
+++ grub-2.00/util/grub.d/10_illumos.in 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -35,8 +35,8 @@
|
||||
esac
|
||||
|
||||
echo "menuentry '$(echo "$OS" | grub_quote)' ${CLASS} \$menuentry_id_option 'illumos-$(grub_get_device_id "${GRUB_DEVICE_BOOT}")' {"
|
||||
-save_default_entry | sed -e "s/^/\t/"
|
||||
-prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"
|
||||
+save_default_entry | grub_add_tab
|
||||
+prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | grub_add_tab
|
||||
message="$(gettext_printf "Loading kernel of Illumos ...")"
|
||||
cat << EOF
|
||||
insmod gzio
|
||||
diff -Nur grub-2.00.orig/util/grub.d/10_kfreebsd.in grub-2.00/util/grub.d/10_kfreebsd.in
|
||||
--- grub-2.00.orig/util/grub.d/10_kfreebsd.in 2012-03-05 06:02:30.000000000 +0900
|
||||
+++ grub-2.00/util/grub.d/10_kfreebsd.in 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -54,7 +54,7 @@
|
||||
fi
|
||||
|
||||
if [ -z "${prepare_module_dir_cache}" ]; then
|
||||
- prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}") | sed -e "s/^/\t/")"
|
||||
+ prepare_module_dir_cache="$(prepare_grub_to_access_device $(${grub_probe} -t device "${module_dir}") | grub_add_tab)"
|
||||
fi
|
||||
|
||||
printf '%s\n' "${prepare_module_dir_cache}"
|
||||
@@ -91,10 +91,10 @@
|
||||
echo "menuentry '$(echo "$OS" | grub_quote)' ${CLASS} \$menuentry_id_option 'kfreebsd-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
||||
fi
|
||||
if [ x$type != xrecovery ] ; then
|
||||
- save_default_entry | sed -e "s/^/\t/" | sed "s/^/$submenu_indentation/"
|
||||
+ save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/"
|
||||
fi
|
||||
if [ -z "${prepare_boot_cache}" ]; then
|
||||
- prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
|
||||
+ prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
|
||||
fi
|
||||
|
||||
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
||||
@@ -112,7 +112,7 @@
|
||||
|
||||
load_kfreebsd_module acpi true
|
||||
|
||||
- for abstraction in dummy $(grub-probe -t abstraction --device ${GRUB_DEVICE}) ; do
|
||||
+ for abstraction in dummy $(${grub_probe} -t abstraction --device ${GRUB_DEVICE}) ; do
|
||||
case $abstraction in
|
||||
lvm) load_kfreebsd_module geom_linux_lvm false ;;
|
||||
esac
|
||||
@@ -122,10 +122,10 @@
|
||||
zfs)
|
||||
load_kfreebsd_module opensolaris false
|
||||
|
||||
- ls "${dirname}/zfs/zpool.cache" > /dev/null
|
||||
+ ls "/boot/zfs/zpool.cache" > /dev/null
|
||||
printf '%s\n' "${prepare_boot_cache}"
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
- kfreebsd_module ${rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
|
||||
+ kfreebsd_module $(make_system_path_relative_to_its_root /boot)/zfs/zpool.cache type=/boot/zfs/zpool.cache
|
||||
EOF
|
||||
;;
|
||||
esac
|
||||
@@ -179,7 +179,7 @@
|
||||
case ${GRUB_FS} in
|
||||
zfs)
|
||||
# zpool name
|
||||
- kfreebsd_device=$(grub-probe -t fs_label --device ${GRUB_DEVICE})
|
||||
+ kfreebsd_device=$(${grub_probe} -t fs_label --device ${GRUB_DEVICE})
|
||||
# filesystem name (empty string for the main filesystem)
|
||||
kfreebsd_device="${kfreebsd_device}$(${grub_mkrelpath} / | sed -e "s,/*@$,,")"
|
||||
;;
|
||||
@@ -213,7 +213,7 @@
|
||||
|
||||
if [ "x$is_first_entry" = xtrue ]; then
|
||||
kfreebsd_entry "${OS}" "${version}" simple
|
||||
- submenu_indentation="\t"
|
||||
+ submenu_indentation="$grub_tab"
|
||||
|
||||
if [ -z "$boot_device_id" ]; then
|
||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
||||
diff -Nur grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in
|
||||
--- grub-2.00.orig/util/grub.d/10_linux.in 2012-04-19 06:24:38.000000000 +0900
|
||||
+++ grub-2.00/util/grub.d/10_linux.in 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -101,7 +101,7 @@
|
||||
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
||||
fi
|
||||
if [ x$type != xrecovery ] ; then
|
||||
- save_default_entry | sed -e "s/^/\t/"
|
||||
+ save_default_entry | grub_add_tab
|
||||
fi
|
||||
|
||||
# Use ELILO's generic "efifb" when it's known to be available.
|
||||
@@ -123,12 +123,12 @@
|
||||
|
||||
if [ x$dirname = x/ ]; then
|
||||
if [ -z "${prepare_root_cache}" ]; then
|
||||
- prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/")"
|
||||
+ prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab)"
|
||||
fi
|
||||
printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/"
|
||||
else
|
||||
if [ -z "${prepare_boot_cache}" ]; then
|
||||
- prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
|
||||
+ prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
|
||||
fi
|
||||
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
||||
fi
|
||||
@@ -230,7 +230,7 @@
|
||||
linux_entry "${OS}" "${version}" simple \
|
||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||||
|
||||
- submenu_indentation="\t"
|
||||
+ submenu_indentation="$grub_tab"
|
||||
|
||||
if [ -z "$boot_device_id" ]; then
|
||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
||||
diff -Nur grub-2.00.orig/util/grub.d/10_netbsd.in grub-2.00/util/grub.d/10_netbsd.in
|
||||
--- grub-2.00.orig/util/grub.d/10_netbsd.in 2012-03-05 04:47:35.000000000 +0900
|
||||
+++ grub-2.00/util/grub.d/10_netbsd.in 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -77,10 +77,10 @@
|
||||
prepare_grub_to_access_device $(${grub_probe} -t device "${kmodule}") | sed -e 's,^, ,'
|
||||
case "${loader}" in
|
||||
knetbsd)
|
||||
- printf "\tknetbsd_module_elf %s\n" "${kmodule_rel}"
|
||||
+ printf "$grub_tabknetbsd_module_elf %s\n" "${kmodule_rel}"
|
||||
;;
|
||||
multiboot)
|
||||
- printf "\tmodule %s\n" "${kmodule_rel}"
|
||||
+ printf "$grub_tabmodule %s\n" "${kmodule_rel}"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
@@ -121,11 +121,11 @@
|
||||
printf "%s\n" "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
||||
case "${loader}" in
|
||||
knetbsd)
|
||||
- printf "\tknetbsd %s -r %s %s\n" \
|
||||
+ printf "$grub_tabknetbsd %s -r %s %s\n" \
|
||||
"${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}" | sed "s/^/$submenu_indentation/"
|
||||
;;
|
||||
multiboot)
|
||||
- printf "\tmultiboot %s %s root=%s %s\n" \
|
||||
+ printf "$grub_tabmultiboot %s %s root=%s %s\n" \
|
||||
"${kernel}" "${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}" | sed "s/^/$submenu_indentation/"
|
||||
;;
|
||||
esac
|
||||
@@ -159,7 +159,7 @@
|
||||
|
||||
if [ "x$is_first_entry" = xtrue ]; then
|
||||
netbsd_entry "knetbsd" "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}"
|
||||
- submenu_indentation="\t"
|
||||
+ submenu_indentation="$grub_tab"
|
||||
|
||||
if [ -z "$boot_device_id" ]; then
|
||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
||||
diff -Nur grub-2.00.orig/util/grub.d/10_windows.in grub-2.00/util/grub.d/10_windows.in
|
||||
--- grub-2.00.orig/util/grub.d/10_windows.in 2012-03-05 06:11:43.000000000 +0900
|
||||
+++ grub-2.00/util/grub.d/10_windows.in 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -45,7 +45,7 @@
|
||||
sort | uniq | wc -l`" = 1 || return 1
|
||||
|
||||
# Search 'default=PARTITION'
|
||||
- get_os_name_from_boot_ini_part=`sed -n 's,^default=,,p' "$1" | sed 's,\\\\,/,g;s,[ \t\r]*$,,;1q'`
|
||||
+ get_os_name_from_boot_ini_part=`sed -n 's,^default=,,p' "$1" | sed 's,\\\\,/,g;s,[ $grub_tab\r]*$,,;1q'`
|
||||
test -n "$get_os_name_from_boot_ini_part" || return 1
|
||||
|
||||
# Search 'PARTITION="NAME" ...'
|
||||
@@ -87,8 +87,8 @@
|
||||
menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
|
||||
EOF
|
||||
|
||||
- save_default_entry | sed -e 's,^,\t,'
|
||||
- prepare_grub_to_access_device "$dev" | sed 's,^,\t,'
|
||||
+ save_default_entry | sed -e 's,^,$grub_tab,'
|
||||
+ prepare_grub_to_access_device "$dev" | sed 's,^,$grub_tab,'
|
||||
test -z "$needmap" || cat <<EOF
|
||||
drivemap -s (hd0) \$root
|
||||
EOF
|
||||
diff -Nur grub-2.00.orig/util/grub.d/10_xnu.in grub-2.00/util/grub.d/10_xnu.in
|
||||
--- grub-2.00.orig/util/grub.d/10_xnu.in 2012-05-29 19:31:03.000000000 +0900
|
||||
+++ grub-2.00/util/grub.d/10_xnu.in 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -39,8 +39,8 @@
|
||||
cat << EOF
|
||||
menuentry '$(echo "Darwin/Mac OS X $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${GRUB_DEVICE}")' {
|
||||
EOF
|
||||
- save_default_entry | sed -e "s/^/ /"
|
||||
- prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/ /"
|
||||
+ save_default_entry | grub_add_tab
|
||||
+ prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab
|
||||
cat << EOF
|
||||
load_video
|
||||
set do_resume=0
|
||||
diff -Nur grub-2.00.orig/util/grub.d/20_linux_xen.in grub-2.00/util/grub.d/20_linux_xen.in
|
||||
--- grub-2.00.orig/util/grub.d/20_linux_xen.in 2012-06-04 04:57:42.000000000 +0900
|
||||
+++ grub-2.00/util/grub.d/20_linux_xen.in 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -110,11 +110,11 @@
|
||||
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
||||
fi
|
||||
if [ x$type != xrecovery ] ; then
|
||||
- save_default_entry | sed -e "s/^/\t/" | sed "s/^/$submenu_indentation/"
|
||||
+ save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/"
|
||||
fi
|
||||
|
||||
if [ -z "${prepare_boot_cache}" ]; then
|
||||
- prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
|
||||
+ prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
|
||||
fi
|
||||
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
||||
xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
|
||||
@@ -236,7 +236,7 @@
|
||||
linux_entry "${OS}" "${version}" "${xen_version}" simple \
|
||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
|
||||
|
||||
- submenu_indentation="\t\t"
|
||||
+ submenu_indentation="$grub_tab$grub_tab"
|
||||
|
||||
if [ -z "$boot_device_id" ]; then
|
||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
||||
diff -Nur grub-2.00.orig/util/grub.d/30_os-prober.in grub-2.00/util/grub.d/30_os-prober.in
|
||||
--- grub-2.00.orig/util/grub.d/30_os-prober.in 2012-03-05 05:52:03.000000000 +0900
|
||||
+++ grub-2.00/util/grub.d/30_os-prober.in 2013-01-04 19:50:55.000000000 +0900
|
||||
@@ -54,8 +54,8 @@
|
||||
cat << EOF
|
||||
menuentry '$(echo "${LONGNAME} $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' {
|
||||
EOF
|
||||
- save_default_entry | sed -e "s/^/\t/"
|
||||
- prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
|
||||
+ save_default_entry | grub_add_tab
|
||||
+ prepare_grub_to_access_device ${DEVICE} | grub_add_tab
|
||||
cat << EOF
|
||||
load_video
|
||||
set do_resume=0
|
||||
@@ -126,8 +126,8 @@
|
||||
cat << EOF
|
||||
menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' {
|
||||
EOF
|
||||
- save_default_entry | sed -e "s/^/\t/"
|
||||
- prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
|
||||
+ save_default_entry | grub_add_tab
|
||||
+ prepare_grub_to_access_device ${DEVICE} | grub_add_tab
|
||||
|
||||
case ${LONGNAME} in
|
||||
Windows\ Vista*|Windows\ 7*|Windows\ Server\ 2008*)
|
||||
@@ -181,14 +181,14 @@
|
||||
used_osprober_linux_ids="$used_osprober_linux_ids 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id'"
|
||||
|
||||
if [ -z "${prepare_boot_cache}" ]; then
|
||||
- prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | sed -e "s/^/\t/")"
|
||||
+ prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | grub_add_tab)"
|
||||
fi
|
||||
|
||||
if [ "x$is_first_entry" = xtrue ]; then
|
||||
cat << EOF
|
||||
menuentry '$(echo "$OS" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' {
|
||||
EOF
|
||||
- save_default_entry | sed -e "s/^/\t/"
|
||||
+ save_default_entry | grub_add_tab
|
||||
printf '%s\n' "${prepare_boot_cache}"
|
||||
cat << EOF
|
||||
linux ${LKERNEL} ${LPARAMS}
|
||||
@@ -208,8 +208,8 @@
|
||||
cat << EOF
|
||||
menuentry '$(echo "$title" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-$LKERNEL-${recovery_params}-$boot_device_id' {
|
||||
EOF
|
||||
- save_default_entry | sed -e "s/^/\t\t/"
|
||||
- printf '%s\n' "${prepare_boot_cache}" | sed -e "s/^/\t/"
|
||||
+ save_default_entry | sed -e "s/^/$grub_tab$grub_tab/"
|
||||
+ printf '%s\n' "${prepare_boot_cache}" | grub_add_tab
|
||||
cat << EOF
|
||||
linux ${LKERNEL} ${LPARAMS}
|
||||
EOF
|
||||
@@ -243,8 +243,8 @@
|
||||
cat << EOF
|
||||
menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' {
|
||||
EOF
|
||||
- save_default_entry | sed -e "s/^/\t/"
|
||||
- prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
|
||||
+ save_default_entry | grub_add_tab
|
||||
+ prepare_grub_to_access_device ${DEVICE} | grub_add_tab
|
||||
grub_device="`${grub_probe} --device ${DEVICE} --target=drive`"
|
||||
mach_device="`echo "${grub_device}" | sed -e 's/(\(hd.*\),msdos\(.*\))/\1s\2/'`"
|
||||
grub_fs="`${grub_probe} --device ${DEVICE} --target=fs`"
|
@ -1,15 +0,0 @@
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=424137
|
||||
https://savannah.gnu.org/bugs/?37558
|
||||
https://code.google.com/p/original-mawk/issues/detail?id=17
|
||||
--- grub-core/Makefile.am 2012-07-07 12:29:01 +0000
|
||||
+++ grub-core/Makefile.am 2012-10-12 13:04:02 +0000
|
||||
@@ -349,7 +349,7 @@
|
||||
|
||||
# generate global module dependencies list
|
||||
moddep.lst: syminfo.lst genmoddep.awk video.lst
|
||||
- cat $< | sort | awk -f $(srcdir)/genmoddep.awk > $@ || (rm -f $@; exit 1)
|
||||
+ cat $< | sort | $(AWK) -f $(srcdir)/genmoddep.awk > $@ || (rm -f $@; exit 1)
|
||||
platform_DATA += moddep.lst
|
||||
CLEANFILES += config.log syminfo.lst moddep.lst
|
||||
|
||||
|
@ -1,22 +0,0 @@
|
||||
hack until gzip pulls a newer gnulib version
|
||||
|
||||
From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Blake <eblake@redhat.com>
|
||||
Date: Thu, 29 Mar 2012 13:30:41 -0600
|
||||
Subject: [PATCH] stdio: don't assume gets any more
|
||||
|
||||
Gnulib intentionally does not have a gets module, and now that C11
|
||||
and glibc have dropped it, we should be more proactive about warning
|
||||
any user on a platform that still has a declaration of this dangerous
|
||||
interface.
|
||||
|
||||
--- a/grub-core/gnulib/stdio.in.h
|
||||
+++ b/grub-core/gnulib/stdio.in.h
|
||||
@@ -125,7 +125,6 @@
|
||||
so any use of gets warrants an unconditional warning. Assume it is
|
||||
always declared, since it is required by C89. */
|
||||
#undef gets
|
||||
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||
|
||||
#if @GNULIB_FOPEN@
|
||||
# if @REPLACE_FOPEN@
|
@ -1,46 +0,0 @@
|
||||
Fix parallel make problems.
|
||||
Upstream changesets 4547, 4552, 4578.
|
||||
--- gentpl.py
|
||||
+++ gentpl.py
|
||||
@@ -484,10 +484,10 @@
|
||||
def installdir(default="bin"):
|
||||
return "[+ IF installdir +][+ installdir +][+ ELSE +]" + default + "[+ ENDIF +]"
|
||||
|
||||
-def manpage():
|
||||
+def manpage(adddeps):
|
||||
r = "if COND_MAN_PAGES\n"
|
||||
r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
|
||||
- r += rule("[+ name +].[+ mansection +]", "[+ name +]", """
|
||||
+ r += rule("[+ name +].[+ mansection +]", "[+ name +] " + adddeps, """
|
||||
chmod a+x [+ name +]
|
||||
PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
|
||||
""")
|
||||
@@ -503,7 +503,7 @@
|
||||
r += gvar_add("TESTS", "[+ name +]")
|
||||
r += "[+ ELSE +]"
|
||||
r += var_add(installdir() + "_PROGRAMS", "[+ name +]")
|
||||
- r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
|
||||
+ r += "[+ IF mansection +]" + manpage("") + "[+ ENDIF +]"
|
||||
r += "[+ ENDIF +]"
|
||||
|
||||
r += var_set(cname() + "_SOURCES", platform_sources(platform))
|
||||
@@ -532,7 +532,7 @@
|
||||
r += gvar_add ("TESTS", "[+ name +]")
|
||||
r += "[+ ELSE +]"
|
||||
r += var_add(installdir() + "_SCRIPTS", "[+ name +]")
|
||||
- r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
|
||||
+ r += "[+ IF mansection +]" + manpage("grub-mkconfig_lib") + "[+ ENDIF +]"
|
||||
r += "[+ ENDIF +]"
|
||||
|
||||
r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
|
||||
--- grub-core/Makefile.am
|
||||
+++ grub-core/Makefile.am
|
||||
@@ -63,7 +63,7 @@
|
||||
rs_decoder.S: $(srcdir)/lib/reed_solomon.c
|
||||
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding
|
||||
|
||||
-kern/i386/pc/startup.S: $(builddir)/rs_decoder.S
|
||||
+boot/i386/pc/startup_raw.S: $(builddir)/rs_decoder.S
|
||||
boot/mips/loongson/fwstart.S: $(builddir)/sm712_start.S
|
||||
|
||||
CLEANFILES += grub_script.yy.c grub_script.yy.h
|
@ -1,24 +0,0 @@
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=438612
|
||||
|
||||
=== modified file 'grub-core/net/tftp.c'
|
||||
--- grub-core/net/tftp.c 2012-06-22 20:04:16 +0000
|
||||
+++ grub-core/net/tftp.c 2012-07-02 09:22:50 +0000
|
||||
@@ -143,7 +143,7 @@
|
||||
|
||||
tftph_ack = (struct tftphdr *) nb_ack.data;
|
||||
tftph_ack->opcode = grub_cpu_to_be16 (TFTP_ACK);
|
||||
- tftph_ack->u.ack.block = block;
|
||||
+ tftph_ack->u.ack.block = grub_cpu_to_be16 (block);
|
||||
|
||||
err = grub_net_send_udp_packet (data->sock, &nb_ack);
|
||||
if (err)
|
||||
@@ -225,7 +225,7 @@
|
||||
grub_priority_queue_pop (data->pq);
|
||||
|
||||
if (file->device->net->packs.count < 50)
|
||||
- err = ack (data, tftph->u.data.block);
|
||||
+ err = ack (data, data->block + 1);
|
||||
else
|
||||
{
|
||||
file->device->net->stall = 1;
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,16 +0,0 @@
|
||||
# This is a sample grub.conf for use with Genkernel, per the Gentoo handbook
|
||||
# http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=1&chap=10#doc_chap2
|
||||
# If you are not using Genkernel and you need help creating this file, you
|
||||
# should consult the handbook. Alternatively, consult the grub.conf.sample that
|
||||
# is included with the Grub documentation.
|
||||
|
||||
default 0
|
||||
timeout 30
|
||||
#splashimage=(hd0,0)/boot/grub/splash.xpm.gz
|
||||
|
||||
#title Gentoo Linux 2.6.24-r5
|
||||
#root (hd0,0)
|
||||
#kernel /boot/kernel-genkernel-x86-2.6.24-gentoo-r5 root=/dev/ram0 real_root=/dev/sda3
|
||||
#initrd /boot/initramfs-genkernel-x86-2.6.24-gentoo-r5
|
||||
|
||||
# vim:ft=conf:
|
@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.2 2012/06/28 22:36:53 floppym Exp $
|
||||
#
|
||||
# To populate all changes in this file you need to regenerate your
|
||||
# grub configuration file afterwards:
|
||||
# 'grub2-mkconfig -o /boot/grub2/grub.cfg'
|
||||
#
|
||||
# See the grub info page for documentation on possible variables and
|
||||
# their associated values.
|
||||
|
||||
GRUB_DISTRIBUTOR="Gentoo"
|
||||
|
||||
GRUB_DEFAULT=0
|
||||
GRUB_HIDDEN_TIMEOUT=0
|
||||
GRUB_HIDDEN_TIMEOUT_QUIET=true
|
||||
GRUB_TIMEOUT=10
|
||||
|
||||
GRUB_CMDLINE_LINUX_DEFAULT=""
|
||||
GRUB_CMDLINE_LINUX=""
|
||||
|
||||
# Uncomment to disable graphical terminal (grub-pc only)
|
||||
#GRUB_TERMINAL=console
|
||||
|
||||
# The resolution used on graphical terminal.
|
||||
# Note that you can use only modes which your graphic card supports via VBE.
|
||||
# You can see them in real GRUB with the command `vbeinfo'.
|
||||
#GRUB_GFXMODE=640x480
|
||||
|
||||
# Path to theme spec txt file.
|
||||
# The starfield is by default provided with use truetype.
|
||||
# NOTE: when enabling custom theme, ensure you have required font/etc.
|
||||
#GRUB_THEME="/boot/grub2/themes/starfield/theme.txt"
|
||||
|
||||
# Background image used on graphical terminal.
|
||||
# Can be in various bitmap formats.
|
||||
#GRUB_BACKGROUND="/boot/grub2/mybackground.png"
|
||||
|
||||
# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
|
||||
#GRUB_DISABLE_LINUX_UUID=true
|
||||
|
||||
# Uncomment to disable generation of recovery mode menu entries
|
||||
#GRUB_DISABLE_RECOVERY=true
|
@ -1,99 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.3 2011/04/10 14:34:42 ulm Exp $
|
||||
|
||||
# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
|
||||
|
||||
inherit mount-boot eutils flag-o-matic toolchain-funcs
|
||||
|
||||
SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz
|
||||
mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
DESCRIPTION="GNU GRUB 2 boot loader"
|
||||
HOMEPAGE="http://www.gnu.org/software/grub/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="custom-cflags debug truetype multislot static"
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.2-r5
|
||||
dev-libs/lzo
|
||||
truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/autogen-5.10
|
||||
>=dev-lang/python-2.5.2"
|
||||
[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
|
||||
|
||||
export STRIP_MASK="*/grub/*/*.mod"
|
||||
QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${PN}-1.99-chroot.patch # CHROOT_PATH
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
|
||||
use static && append-ldflags -static
|
||||
|
||||
econf \
|
||||
--disable-werror \
|
||||
--sbindir=/sbin \
|
||||
--bindir=/bin \
|
||||
--libdir=/$(get_libdir) \
|
||||
--disable-efiemu \
|
||||
$(use_enable truetype grub-mkfont) \
|
||||
$(use_enable debug mm-debug) \
|
||||
$(use_enable debug grub-emu) \
|
||||
$(use_enable debug grub-emu-usb) \
|
||||
$(use_enable debug grub-fstest)
|
||||
emake -j1 || die "making regular stuff"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
insinto /etc/default
|
||||
newins "${FILESDIR}"/defaults grub || die
|
||||
cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
|
||||
GRUB_DISTRIBUTOR=\${GRUB_DISTRIBUTOR:-"Calculate"}
|
||||
EOF
|
||||
if use multislot ; then
|
||||
sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
|
||||
mv "${D}"/sbin/grub{,2}-install || die
|
||||
mv "${D}"/sbin/grub{,2}-set-default || die
|
||||
mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
|
||||
mv "${D}"/usr/share/info/grub{,2}.info || die
|
||||
fi
|
||||
}
|
||||
|
||||
setup_boot_dir() {
|
||||
local boot_dir=$1
|
||||
local dir=${boot_dir}/grub
|
||||
|
||||
if [[ ! -e ${dir}/grub.cfg ]] ; then
|
||||
einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
|
||||
grub-mkconfig -o "${dir}/grub.cfg"
|
||||
fi
|
||||
|
||||
#local install=grub-install
|
||||
#use multislot && install="grub2-install --grub-setup=/bin/true"
|
||||
#einfo "Running: ${install} "
|
||||
#${install}
|
||||
}
|
||||
|
||||
#pkg_postinst() {
|
||||
# mount-boot_mount_boot_partition
|
||||
#
|
||||
# if use multislot ; then
|
||||
# elog "You have installed grub2 with USE=multislot, so to coexist"
|
||||
# elog "with grub1, the grub2 install binary is named grub2-install."
|
||||
# fi
|
||||
# setup_boot_dir "${ROOT}"boot
|
||||
#
|
||||
# # needs to be after we call setup_boot_dir
|
||||
# mount-boot_pkg_postinst
|
||||
#}
|
@ -1,99 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.3 2011/04/10 14:34:42 ulm Exp $
|
||||
|
||||
# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
|
||||
|
||||
inherit mount-boot eutils flag-o-matic toolchain-funcs
|
||||
|
||||
SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz
|
||||
mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
DESCRIPTION="GNU GRUB 2 boot loader"
|
||||
HOMEPAGE="http://www.gnu.org/software/grub/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="custom-cflags debug truetype multislot static"
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.2-r5
|
||||
dev-libs/lzo
|
||||
truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/autogen-5.10
|
||||
>=dev-lang/python-2.5.2"
|
||||
[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
|
||||
|
||||
export STRIP_MASK="*/grub/*/*.mod"
|
||||
QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${PN}-1.99-chroot.patch # CHROOT_PATH
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
|
||||
use static && append-ldflags -static
|
||||
|
||||
econf \
|
||||
--disable-werror \
|
||||
--sbindir=/sbin \
|
||||
--bindir=/bin \
|
||||
--libdir=/$(get_libdir) \
|
||||
--disable-efiemu \
|
||||
$(use_enable truetype grub-mkfont) \
|
||||
$(use_enable debug mm-debug) \
|
||||
$(use_enable debug grub-emu) \
|
||||
$(use_enable debug grub-emu-usb) \
|
||||
$(use_enable debug grub-fstest)
|
||||
emake -j1 || die "making regular stuff"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
insinto /etc/default
|
||||
newins "${FILESDIR}"/defaults grub || die
|
||||
cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
|
||||
GRUB_DISTRIBUTOR=\${GRUB_DISTRIBUTOR:-"Calculate"}
|
||||
EOF
|
||||
if use multislot ; then
|
||||
sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
|
||||
mv "${D}"/sbin/grub{,2}-install || die
|
||||
mv "${D}"/sbin/grub{,2}-set-default || die
|
||||
mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
|
||||
mv "${D}"/usr/share/info/grub{,2}.info || die
|
||||
fi
|
||||
}
|
||||
|
||||
setup_boot_dir() {
|
||||
local boot_dir=$1
|
||||
local dir=${boot_dir}/grub
|
||||
|
||||
if [[ ! -e ${dir}/grub.cfg ]] ; then
|
||||
einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
|
||||
grub-mkconfig -o "${dir}/grub.cfg"
|
||||
fi
|
||||
|
||||
#local install=grub-install
|
||||
#use multislot && install="grub2-install --grub-setup=/bin/true"
|
||||
#einfo "Running: ${install} "
|
||||
#${install}
|
||||
}
|
||||
|
||||
#pkg_postinst() {
|
||||
# mount-boot_mount_boot_partition
|
||||
#
|
||||
# if use multislot ; then
|
||||
# elog "You have installed grub2 with USE=multislot, so to coexist"
|
||||
# elog "with grub1, the grub2 install binary is named grub2-install."
|
||||
# fi
|
||||
# setup_boot_dir "${ROOT}"boot
|
||||
#
|
||||
# # needs to be after we call setup_boot_dir
|
||||
# mount-boot_pkg_postinst
|
||||
#}
|
@ -1,100 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.3 2011/04/10 14:34:42 ulm Exp $
|
||||
|
||||
# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
|
||||
|
||||
inherit mount-boot eutils flag-o-matic toolchain-funcs
|
||||
|
||||
SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz
|
||||
mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
DESCRIPTION="GNU GRUB 2 boot loader"
|
||||
HOMEPAGE="http://www.gnu.org/software/grub/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="custom-cflags debug truetype multislot static"
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.2-r5
|
||||
dev-libs/lzo
|
||||
truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/autogen-5.10
|
||||
>=dev-lang/python-2.5.2"
|
||||
[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
|
||||
|
||||
export STRIP_MASK="*/grub/*/*.mod"
|
||||
QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${PN}-1.99-chroot.patch # CHROOT_PATH
|
||||
epatch "${FILESDIR}"/${PN}-1.99-lvm_mapper.patch # lvm mapper
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
|
||||
use static && append-ldflags -static
|
||||
|
||||
econf \
|
||||
--disable-werror \
|
||||
--sbindir=/sbin \
|
||||
--bindir=/bin \
|
||||
--libdir=/$(get_libdir) \
|
||||
--disable-efiemu \
|
||||
$(use_enable truetype grub-mkfont) \
|
||||
$(use_enable debug mm-debug) \
|
||||
$(use_enable debug grub-emu) \
|
||||
$(use_enable debug grub-emu-usb) \
|
||||
$(use_enable debug grub-fstest)
|
||||
emake -j1 || die "making regular stuff"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
insinto /etc/default
|
||||
newins "${FILESDIR}"/defaults grub || die
|
||||
cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
|
||||
GRUB_DISTRIBUTOR=\${GRUB_DISTRIBUTOR:-"Calculate"}
|
||||
EOF
|
||||
if use multislot ; then
|
||||
sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
|
||||
mv "${D}"/sbin/grub{,2}-install || die
|
||||
mv "${D}"/sbin/grub{,2}-set-default || die
|
||||
mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
|
||||
mv "${D}"/usr/share/info/grub{,2}.info || die
|
||||
fi
|
||||
}
|
||||
|
||||
setup_boot_dir() {
|
||||
local boot_dir=$1
|
||||
local dir=${boot_dir}/grub
|
||||
|
||||
if [[ ! -e ${dir}/grub.cfg ]] ; then
|
||||
einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
|
||||
grub-mkconfig -o "${dir}/grub.cfg"
|
||||
fi
|
||||
|
||||
#local install=grub-install
|
||||
#use multislot && install="grub2-install --grub-setup=/bin/true"
|
||||
#einfo "Running: ${install} "
|
||||
#${install}
|
||||
}
|
||||
|
||||
#pkg_postinst() {
|
||||
# mount-boot_mount_boot_partition
|
||||
#
|
||||
# if use multislot ; then
|
||||
# elog "You have installed grub2 with USE=multislot, so to coexist"
|
||||
# elog "with grub1, the grub2 install binary is named grub2-install."
|
||||
# fi
|
||||
# setup_boot_dir "${ROOT}"boot
|
||||
#
|
||||
# # needs to be after we call setup_boot_dir
|
||||
# mount-boot_pkg_postinst
|
||||
#}
|
@ -1,100 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.3 2011/04/10 14:34:42 ulm Exp $
|
||||
|
||||
# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
|
||||
|
||||
inherit mount-boot eutils flag-o-matic toolchain-funcs
|
||||
|
||||
SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz
|
||||
mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
DESCRIPTION="GNU GRUB 2 boot loader"
|
||||
HOMEPAGE="http://www.gnu.org/software/grub/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="custom-cflags debug truetype multislot static"
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.2-r5
|
||||
dev-libs/lzo
|
||||
truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/autogen-5.10
|
||||
>=dev-lang/python-2.5.2"
|
||||
[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
|
||||
|
||||
export STRIP_MASK="*/grub/*/*.mod"
|
||||
QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${PN}-1.99-chroot.patch # CHROOT_PATH
|
||||
epatch "${FILESDIR}"/${PN}-1.99-lvm_mapper-r1.patch # lvm mapper
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
|
||||
use static && append-ldflags -static
|
||||
|
||||
econf \
|
||||
--disable-werror \
|
||||
--sbindir=/sbin \
|
||||
--bindir=/bin \
|
||||
--libdir=/$(get_libdir) \
|
||||
--disable-efiemu \
|
||||
$(use_enable truetype grub-mkfont) \
|
||||
$(use_enable debug mm-debug) \
|
||||
$(use_enable debug grub-emu) \
|
||||
$(use_enable debug grub-emu-usb) \
|
||||
$(use_enable debug grub-fstest)
|
||||
emake -j1 || die "making regular stuff"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
insinto /etc/default
|
||||
newins "${FILESDIR}"/defaults grub || die
|
||||
cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
|
||||
GRUB_DISTRIBUTOR=\${GRUB_DISTRIBUTOR:-"Calculate"}
|
||||
EOF
|
||||
if use multislot ; then
|
||||
sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
|
||||
mv "${D}"/sbin/grub{,2}-install || die
|
||||
mv "${D}"/sbin/grub{,2}-set-default || die
|
||||
mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
|
||||
mv "${D}"/usr/share/info/grub{,2}.info || die
|
||||
fi
|
||||
}
|
||||
|
||||
setup_boot_dir() {
|
||||
local boot_dir=$1
|
||||
local dir=${boot_dir}/grub
|
||||
|
||||
if [[ ! -e ${dir}/grub.cfg ]] ; then
|
||||
einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
|
||||
grub-mkconfig -o "${dir}/grub.cfg"
|
||||
fi
|
||||
|
||||
#local install=grub-install
|
||||
#use multislot && install="grub2-install --grub-setup=/bin/true"
|
||||
#einfo "Running: ${install} "
|
||||
#${install}
|
||||
}
|
||||
|
||||
#pkg_postinst() {
|
||||
# mount-boot_mount_boot_partition
|
||||
#
|
||||
# if use multislot ; then
|
||||
# elog "You have installed grub2 with USE=multislot, so to coexist"
|
||||
# elog "with grub1, the grub2 install binary is named grub2-install."
|
||||
# fi
|
||||
# setup_boot_dir "${ROOT}"boot
|
||||
#
|
||||
# # needs to be after we call setup_boot_dir
|
||||
# mount-boot_pkg_postinst
|
||||
#}
|
@ -1,101 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.3 2011/04/10 14:34:42 ulm Exp $
|
||||
|
||||
# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
|
||||
|
||||
inherit mount-boot eutils flag-o-matic toolchain-funcs
|
||||
|
||||
SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz
|
||||
mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
DESCRIPTION="GNU GRUB 2 boot loader"
|
||||
HOMEPAGE="http://www.gnu.org/software/grub/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="custom-cflags debug truetype multislot static"
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.2-r5
|
||||
dev-libs/lzo
|
||||
truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/autogen-5.10
|
||||
>=dev-lang/python-2.5.2"
|
||||
[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
|
||||
|
||||
export STRIP_MASK="*/grub/*/*.mod"
|
||||
QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${PN}-1.99-chroot.patch # CHROOT_PATH
|
||||
epatch "${FILESDIR}"/${PN}-1.99-lvm_mapper-r1.patch # lvm mapper
|
||||
epatch "${FILESDIR}"/${PN}-1.99-latest_version_backport.patch #version
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
|
||||
use static && append-ldflags -static
|
||||
|
||||
econf \
|
||||
--disable-werror \
|
||||
--sbindir=/sbin \
|
||||
--bindir=/bin \
|
||||
--libdir=/$(get_libdir) \
|
||||
--disable-efiemu \
|
||||
$(use_enable truetype grub-mkfont) \
|
||||
$(use_enable debug mm-debug) \
|
||||
$(use_enable debug grub-emu) \
|
||||
$(use_enable debug grub-emu-usb) \
|
||||
$(use_enable debug grub-fstest)
|
||||
emake -j1 || die "making regular stuff"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
insinto /etc/default
|
||||
newins "${FILESDIR}"/defaults grub || die
|
||||
cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
|
||||
GRUB_DISTRIBUTOR=\${GRUB_DISTRIBUTOR:-"Calculate"}
|
||||
EOF
|
||||
if use multislot ; then
|
||||
sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
|
||||
mv "${D}"/sbin/grub{,2}-install || die
|
||||
mv "${D}"/sbin/grub{,2}-set-default || die
|
||||
mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
|
||||
mv "${D}"/usr/share/info/grub{,2}.info || die
|
||||
fi
|
||||
}
|
||||
|
||||
setup_boot_dir() {
|
||||
local boot_dir=$1
|
||||
local dir=${boot_dir}/grub
|
||||
|
||||
if [[ ! -e ${dir}/grub.cfg ]] ; then
|
||||
einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
|
||||
grub-mkconfig -o "${dir}/grub.cfg"
|
||||
fi
|
||||
|
||||
#local install=grub-install
|
||||
#use multislot && install="grub2-install --grub-setup=/bin/true"
|
||||
#einfo "Running: ${install} "
|
||||
#${install}
|
||||
}
|
||||
|
||||
#pkg_postinst() {
|
||||
# mount-boot_mount_boot_partition
|
||||
#
|
||||
# if use multislot ; then
|
||||
# elog "You have installed grub2 with USE=multislot, so to coexist"
|
||||
# elog "with grub1, the grub2 install binary is named grub2-install."
|
||||
# fi
|
||||
# setup_boot_dir "${ROOT}"boot
|
||||
#
|
||||
# # needs to be after we call setup_boot_dir
|
||||
# mount-boot_pkg_postinst
|
||||
#}
|
@ -1,99 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.3 2011/04/10 14:34:42 ulm Exp $
|
||||
|
||||
# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
|
||||
|
||||
inherit mount-boot eutils flag-o-matic toolchain-funcs
|
||||
|
||||
SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz
|
||||
mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
DESCRIPTION="GNU GRUB 2 boot loader"
|
||||
HOMEPAGE="http://www.gnu.org/software/grub/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="custom-cflags debug truetype multislot static"
|
||||
|
||||
RDEPEND=">=sys-libs/ncurses-5.2-r5
|
||||
dev-libs/lzo
|
||||
truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/autogen-5.10
|
||||
>=dev-lang/python-2.5.2"
|
||||
[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
|
||||
|
||||
export STRIP_MASK="*/grub/*/*.mod"
|
||||
QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${PN}-1.99-chroot.patch # CHROOT_PATH
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
|
||||
use static && append-ldflags -static
|
||||
|
||||
econf \
|
||||
--disable-werror \
|
||||
--sbindir=/sbin \
|
||||
--bindir=/bin \
|
||||
--libdir=/$(get_libdir) \
|
||||
--disable-efiemu \
|
||||
$(use_enable truetype grub-mkfont) \
|
||||
$(use_enable debug mm-debug) \
|
||||
$(use_enable debug grub-emu) \
|
||||
$(use_enable debug grub-emu-usb) \
|
||||
$(use_enable debug grub-fstest)
|
||||
emake -j1 || die "making regular stuff"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
insinto /etc/default
|
||||
newins "${FILESDIR}"/defaults grub || die
|
||||
cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
|
||||
GRUB_DISTRIBUTOR=\${GRUB_DISTRIBUTOR:-"Calculate"}
|
||||
EOF
|
||||
if use multislot ; then
|
||||
sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
|
||||
mv "${D}"/sbin/grub{,2}-install || die
|
||||
mv "${D}"/sbin/grub{,2}-set-default || die
|
||||
mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
|
||||
mv "${D}"/usr/share/info/grub{,2}.info || die
|
||||
fi
|
||||
}
|
||||
|
||||
setup_boot_dir() {
|
||||
local boot_dir=$1
|
||||
local dir=${boot_dir}/grub
|
||||
|
||||
if [[ ! -e ${dir}/grub.cfg ]] ; then
|
||||
einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
|
||||
grub-mkconfig -o "${dir}/grub.cfg"
|
||||
fi
|
||||
|
||||
#local install=grub-install
|
||||
#use multislot && install="grub2-install --grub-setup=/bin/true"
|
||||
#einfo "Running: ${install} "
|
||||
#${install}
|
||||
}
|
||||
|
||||
#pkg_postinst() {
|
||||
# mount-boot_mount_boot_partition
|
||||
#
|
||||
# if use multislot ; then
|
||||
# elog "You have installed grub2 with USE=multislot, so to coexist"
|
||||
# elog "with grub1, the grub2 install binary is named grub2-install."
|
||||
# fi
|
||||
# setup_boot_dir "${ROOT}"boot
|
||||
#
|
||||
# # needs to be after we call setup_boot_dir
|
||||
# mount-boot_pkg_postinst
|
||||
#}
|
@ -1,368 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r2.ebuild,v 1.5 2013/02/18 16:45:17 mr_bones_ Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
|
||||
LIVE_ECLASS="bzr"
|
||||
SRC_URI=""
|
||||
DO_AUTORECONF="true"
|
||||
else
|
||||
MY_P=${P/_/\~}
|
||||
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
|
||||
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
|
||||
else
|
||||
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
|
||||
mirror://gentoo/${MY_P}.tar.xz"
|
||||
fi
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
DO_AUTORECONF="true"
|
||||
fi
|
||||
|
||||
inherit eutils flag-o-matic multiprocessing pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
|
||||
unset LIVE_ECLASS
|
||||
|
||||
DESCRIPTION="GNU GRUB boot loader"
|
||||
HOMEPAGE="http://www.gnu.org/software/grub/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="2"
|
||||
IUSE="custom-cflags debug device-mapper doc efiemu mount nls static sdl truetype libzfs"
|
||||
|
||||
GRUB_PLATFORMS=(
|
||||
# everywhere:
|
||||
emu
|
||||
# mips only:
|
||||
qemu-mips yeeloong
|
||||
# amd64, x86, ppc, ppc64:
|
||||
ieee1275
|
||||
# amd64, x86:
|
||||
coreboot multiboot efi-32 pc qemu
|
||||
# amd64, ia64:
|
||||
efi-64
|
||||
)
|
||||
IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
|
||||
|
||||
REQUIRED_USE="grub_platforms_qemu? ( truetype )
|
||||
grub_platforms_yeeloong? ( truetype )"
|
||||
|
||||
# os-prober: Used on runtime to detect other OSes
|
||||
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
|
||||
RDEPEND="
|
||||
app-arch/xz-utils
|
||||
>=sys-libs/ncurses-5.2-r5
|
||||
debug? (
|
||||
sdl? ( media-libs/libsdl )
|
||||
)
|
||||
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
|
||||
libzfs? ( sys-fs/zfs )
|
||||
mount? ( sys-fs/fuse )
|
||||
truetype? (
|
||||
media-libs/freetype
|
||||
media-fonts/dejavu
|
||||
>=media-fonts/unifont-5
|
||||
)
|
||||
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
|
||||
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-lang/python-2.5.2
|
||||
sys-devel/flex
|
||||
sys-devel/bison
|
||||
sys-apps/help2man
|
||||
sys-apps/texinfo
|
||||
static? (
|
||||
truetype? (
|
||||
app-arch/bzip2[static-libs(+)]
|
||||
media-libs/freetype[static-libs(+)]
|
||||
sys-libs/zlib[static-libs(+)]
|
||||
)
|
||||
)
|
||||
"
|
||||
RDEPEND+="
|
||||
kernel_linux? (
|
||||
grub_platforms_efi-32? ( sys-boot/efibootmgr )
|
||||
grub_platforms_efi-64? ( sys-boot/efibootmgr )
|
||||
)
|
||||
"
|
||||
if [[ -n ${DO_AUTORECONF} ]] ; then
|
||||
DEPEND+=" >=sys-devel/autogen-5.10"
|
||||
fi
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
DEPEND+=" app-arch/xz-utils"
|
||||
fi
|
||||
|
||||
export STRIP_MASK="*/grub/*/*.{mod,img}"
|
||||
|
||||
QA_EXECSTACK="
|
||||
usr/bin/grub*
|
||||
usr/sbin/grub*
|
||||
usr/lib*/grub/*/*.mod
|
||||
usr/lib*/grub/*/kernel.exec
|
||||
usr/lib*/grub/*/kernel.img
|
||||
usr/lib*/grub/*/setjmp.module
|
||||
"
|
||||
|
||||
QA_WX_LOAD="
|
||||
usr/lib*/grub/*/kernel.exec
|
||||
usr/lib*/grub/*/kernel.img
|
||||
usr/lib*/grub/*/*.image
|
||||
"
|
||||
|
||||
QA_PRESTRIPPED="
|
||||
usr/lib.*/grub/.*/kernel.img
|
||||
"
|
||||
|
||||
grub_run_phase() {
|
||||
local phase=$1
|
||||
local platform=$2
|
||||
[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
|
||||
|
||||
[[ -d "${WORKDIR}/build-${platform}" ]] || \
|
||||
{ mkdir "${WORKDIR}/build-${platform}" || die ; }
|
||||
pushd "${WORKDIR}/build-${platform}" > /dev/null || die
|
||||
|
||||
echo ">>> Running ${phase} for platform \"${platform}\""
|
||||
echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
|
||||
|
||||
grub_${phase} ${platform}
|
||||
|
||||
popd > /dev/null || die
|
||||
}
|
||||
|
||||
grub_src_configure() {
|
||||
local platform=$1
|
||||
local with_platform=
|
||||
local enable_efiemu="--disable-efiemu"
|
||||
|
||||
[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
|
||||
|
||||
# Used below for efi cross-building
|
||||
tc-export CC NM OBJCOPY STRIP
|
||||
|
||||
estack_push CTARGET "${CTARGET}"
|
||||
estack_push TARGET_CC "${TARGET_CC}"
|
||||
estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
|
||||
estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
|
||||
|
||||
case ${platform} in
|
||||
efi-32)
|
||||
if [[ ${CHOST} == x86_64* ]]; then
|
||||
CTARGET="${CTARGET:-i386}"
|
||||
TARGET_CC="${TARGET_CC:-${CC}}"
|
||||
export TARGET_CC
|
||||
fi
|
||||
with_platform="--with-platform=efi"
|
||||
;;
|
||||
efi-64)
|
||||
if [[ ${CHOST} == i?86* ]]; then
|
||||
CTARGET="${CTARGET:-x86_64}"
|
||||
TARGET_CC="${TARGET_CC:-${CC}}"
|
||||
TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
|
||||
TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
|
||||
export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
|
||||
fi
|
||||
with_platform="--with-platform=efi"
|
||||
;;
|
||||
guessed) ;;
|
||||
*)
|
||||
with_platform="--with-platform=${platform}"
|
||||
case ${CTARGET:-${CHOST}} in
|
||||
i?86*|x86_64*)
|
||||
enable_efiemu=$(use_enable efiemu)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
ECONF_SOURCE="${S}" \
|
||||
econf \
|
||||
--libdir=/usr/lib \
|
||||
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
|
||||
--disable-werror \
|
||||
--program-prefix= \
|
||||
${with_platform} \
|
||||
$(use_enable debug mm-debug) \
|
||||
$(use_enable debug grub-emu-usb) \
|
||||
$(use_enable device-mapper) \
|
||||
${enable_efiemu} \
|
||||
$(use_enable mount grub-mount) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable truetype grub-mkfont) \
|
||||
$(use_enable libzfs) \
|
||||
$(use sdl && use_enable debug grub-emu-sdl)
|
||||
|
||||
estack_pop CTARGET CTARGET || die
|
||||
estack_pop TARGET_CC TARGET_CC || die
|
||||
estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
|
||||
estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
|
||||
}
|
||||
|
||||
grub_src_compile() {
|
||||
default_src_compile
|
||||
pax-mark -mpes "${grub_binaries[@]}"
|
||||
}
|
||||
|
||||
grub_build_docs() {
|
||||
emake -C docs html
|
||||
}
|
||||
|
||||
grub_src_install() {
|
||||
default_src_install
|
||||
}
|
||||
|
||||
grub_install_docs() {
|
||||
emake -C docs DESTDIR="${D}" install-html
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
# Bug 439082
|
||||
if $(tc-getLD) --version | grep -q "GNU gold"; then
|
||||
eerror "GRUB does not function correctly when built with the gold linker."
|
||||
eerror "Please select the bfd linker with binutils-config."
|
||||
die "GNU gold detected"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
|
||||
epatch "${FILESDIR}/${P}-no-gets.patch" #424703
|
||||
epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
|
||||
epatch "${FILESDIR}/${P}-tftp-endian.patch" # 438612
|
||||
epatch "${FILESDIR}/${P}-hardcoded-awk.patch" #424137
|
||||
epatch "${FILESDIR}/${P}-freebsd.patch" #442050
|
||||
epatch "${FILESDIR}/${P}-compression.patch" #424527
|
||||
epatch "${FILESDIR}/${P}-zfs-feature-flag-support.patch" #455358
|
||||
fi
|
||||
|
||||
# fix texinfo file name, bug 416035
|
||||
sed -i \
|
||||
-e 's/^\* GRUB:/* GRUB2:/' \
|
||||
-e 's/(grub)/(grub2)/' -- \
|
||||
"${S}"/docs/grub.texi
|
||||
|
||||
epatch_user
|
||||
|
||||
# autogen.sh does more than just run autotools
|
||||
if [[ -n ${DO_AUTORECONF} ]] ; then
|
||||
sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
|
||||
(
|
||||
autopoint() { :; }
|
||||
. ./autogen.sh
|
||||
) || die
|
||||
fi
|
||||
|
||||
# install into the right dir for eselect #372735
|
||||
sed -i \
|
||||
-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
|
||||
util/bash-completion.d/Makefile.in || die
|
||||
|
||||
# get enabled platforms
|
||||
GRUB_ENABLED_PLATFORMS=""
|
||||
local i
|
||||
for i in ${GRUB_PLATFORMS[@]}; do
|
||||
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
|
||||
done
|
||||
[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
|
||||
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local i
|
||||
|
||||
use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
|
||||
use static && append-ldflags -static
|
||||
use elibc_FreeBSD && append-cppflags "-isystem /usr/include"
|
||||
|
||||
# Sandbox bug 404013.
|
||||
use libzfs && addpredict /etc/dfs:/dev/zfs
|
||||
|
||||
multijob_init
|
||||
for i in ${GRUB_ENABLED_PLATFORMS}; do
|
||||
multijob_child_init grub_run_phase ${FUNCNAME} ${i}
|
||||
done
|
||||
multijob_finish || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Used for pax marking in grub_src_compile
|
||||
local grub_binaries=(
|
||||
grub-editenv
|
||||
grub-fstest
|
||||
grub-menulst2cfg
|
||||
grub-mkimage
|
||||
grub-mklayout
|
||||
grub-mkpasswd-pbkdf2
|
||||
grub-mkrelpath
|
||||
grub-script-check
|
||||
grub-bios-setup
|
||||
grub-ofpathname
|
||||
grub-probe
|
||||
grub-sparc64-setup
|
||||
)
|
||||
use mount && grub_binaries+=( grub-mount )
|
||||
use truetype && grub_binaries+=( grub-mkfont )
|
||||
|
||||
local i
|
||||
|
||||
for i in ${GRUB_ENABLED_PLATFORMS}; do
|
||||
grub_run_phase ${FUNCNAME} ${i}
|
||||
done
|
||||
|
||||
# Just build docs once
|
||||
use doc && grub_run_phase build_docs ${i}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local i
|
||||
|
||||
for i in ${GRUB_ENABLED_PLATFORMS}; do
|
||||
grub_run_phase ${FUNCNAME} ${i}
|
||||
done
|
||||
|
||||
use doc && grub_run_phase install_docs ${i}
|
||||
|
||||
mv "${ED}"usr/share/info/grub{,2}.info || die
|
||||
|
||||
# can't be in docs array as we use default_src_install in different builddir
|
||||
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
insinto /etc/default
|
||||
newins "${FILESDIR}"/grub.default-2 grub
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
has_version "<sys-boot/grub-2.00-r2:2" && \
|
||||
[[ "$(df -TP /boot | awk 'NR>1{print $2}')" = 'zfs' ]]
|
||||
display_zfs_feature_flag_warning=$?
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# display the link to guide
|
||||
elog "For information on how to configure grub-2 please refer to the guide:"
|
||||
elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
|
||||
if ! has_version sys-boot/os-prober; then
|
||||
elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig."
|
||||
fi
|
||||
if ! has_version dev-libs/libisoburn; then
|
||||
elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
|
||||
fi
|
||||
if has_version sys-boot/grub:0; then
|
||||
ewarn "If you want to keep GRUB Legacy (grub-0.97) installed, please run"
|
||||
ewarn "the following to add sys-boot/grub:0 to your world file."
|
||||
ewarn "emerge --noreplace sys-boot/grub:0"
|
||||
fi
|
||||
if [[ $display_zfs_feature_flag_warning -eq 0 ]]; then
|
||||
zfs_pool=$(df -TP /boot | awk 'NR>1{print $1}')
|
||||
zfs_pool=${zfs_pool%%/*}
|
||||
ewarn "The previous version of sys-boot/grub lacked support for ZFS feature flags."
|
||||
ewarn "Your /boot is on ZFS. Running \"zpool upgrade ${zfs_pool}\" or \"zpool upgrade -a\""
|
||||
ewarn "to upgrade your pool to support feature flags will prevent your system from booting."
|
||||
ewarn "You should use grub2-install to reinstall your boot code. This will avoid problems."
|
||||
fi
|
||||
}
|
@ -1,368 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r2.ebuild,v 1.5 2013/02/18 16:45:17 mr_bones_ Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
|
||||
LIVE_ECLASS="bzr"
|
||||
SRC_URI=""
|
||||
DO_AUTORECONF="true"
|
||||
else
|
||||
MY_P=${P/_/\~}
|
||||
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
|
||||
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
|
||||
else
|
||||
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
|
||||
mirror://gentoo/${MY_P}.tar.xz"
|
||||
fi
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
DO_AUTORECONF="true"
|
||||
fi
|
||||
|
||||
inherit eutils flag-o-matic multiprocessing pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
|
||||
unset LIVE_ECLASS
|
||||
|
||||
DESCRIPTION="GNU GRUB boot loader"
|
||||
HOMEPAGE="http://www.gnu.org/software/grub/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="2"
|
||||
IUSE="custom-cflags debug device-mapper doc efiemu mount nls static sdl truetype libzfs"
|
||||
|
||||
GRUB_PLATFORMS=(
|
||||
# everywhere:
|
||||
emu
|
||||
# mips only:
|
||||
qemu-mips yeeloong
|
||||
# amd64, x86, ppc, ppc64:
|
||||
ieee1275
|
||||
# amd64, x86:
|
||||
coreboot multiboot efi-32 pc qemu
|
||||
# amd64, ia64:
|
||||
efi-64
|
||||
)
|
||||
IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
|
||||
|
||||
REQUIRED_USE="grub_platforms_qemu? ( truetype )
|
||||
grub_platforms_yeeloong? ( truetype )"
|
||||
|
||||
# os-prober: Used on runtime to detect other OSes
|
||||
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
|
||||
RDEPEND="
|
||||
app-arch/xz-utils
|
||||
>=sys-libs/ncurses-5.2-r5
|
||||
debug? (
|
||||
sdl? ( media-libs/libsdl )
|
||||
)
|
||||
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
|
||||
libzfs? ( sys-fs/zfs )
|
||||
mount? ( sys-fs/fuse )
|
||||
truetype? (
|
||||
media-libs/freetype
|
||||
media-fonts/dejavu
|
||||
>=media-fonts/unifont-5
|
||||
)
|
||||
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
|
||||
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-lang/python-2.5.2
|
||||
sys-devel/flex
|
||||
sys-devel/bison
|
||||
sys-apps/help2man
|
||||
sys-apps/texinfo
|
||||
static? (
|
||||
truetype? (
|
||||
app-arch/bzip2[static-libs(+)]
|
||||
media-libs/freetype[static-libs(+)]
|
||||
sys-libs/zlib[static-libs(+)]
|
||||
)
|
||||
)
|
||||
"
|
||||
RDEPEND+="
|
||||
kernel_linux? (
|
||||
grub_platforms_efi-32? ( sys-boot/efibootmgr )
|
||||
grub_platforms_efi-64? ( sys-boot/efibootmgr )
|
||||
)
|
||||
"
|
||||
if [[ -n ${DO_AUTORECONF} ]] ; then
|
||||
DEPEND+=" >=sys-devel/autogen-5.10"
|
||||
fi
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
DEPEND+=" app-arch/xz-utils"
|
||||
fi
|
||||
|
||||
export STRIP_MASK="*/grub/*/*.{mod,img}"
|
||||
|
||||
QA_EXECSTACK="
|
||||
usr/bin/grub*
|
||||
usr/sbin/grub*
|
||||
usr/lib*/grub/*/*.mod
|
||||
usr/lib*/grub/*/kernel.exec
|
||||
usr/lib*/grub/*/kernel.img
|
||||
usr/lib*/grub/*/setjmp.module
|
||||
"
|
||||
|
||||
QA_WX_LOAD="
|
||||
usr/lib*/grub/*/kernel.exec
|
||||
usr/lib*/grub/*/kernel.img
|
||||
usr/lib*/grub/*/*.image
|
||||
"
|
||||
|
||||
QA_PRESTRIPPED="
|
||||
usr/lib.*/grub/.*/kernel.img
|
||||
"
|
||||
|
||||
grub_run_phase() {
|
||||
local phase=$1
|
||||
local platform=$2
|
||||
[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
|
||||
|
||||
[[ -d "${WORKDIR}/build-${platform}" ]] || \
|
||||
{ mkdir "${WORKDIR}/build-${platform}" || die ; }
|
||||
pushd "${WORKDIR}/build-${platform}" > /dev/null || die
|
||||
|
||||
echo ">>> Running ${phase} for platform \"${platform}\""
|
||||
echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
|
||||
|
||||
grub_${phase} ${platform}
|
||||
|
||||
popd > /dev/null || die
|
||||
}
|
||||
|
||||
grub_src_configure() {
|
||||
local platform=$1
|
||||
local with_platform=
|
||||
local enable_efiemu="--disable-efiemu"
|
||||
|
||||
[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
|
||||
|
||||
# Used below for efi cross-building
|
||||
tc-export CC NM OBJCOPY STRIP
|
||||
|
||||
estack_push CTARGET "${CTARGET}"
|
||||
estack_push TARGET_CC "${TARGET_CC}"
|
||||
estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
|
||||
estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
|
||||
|
||||
case ${platform} in
|
||||
efi-32)
|
||||
if [[ ${CHOST} == x86_64* ]]; then
|
||||
CTARGET="${CTARGET:-i386}"
|
||||
TARGET_CC="${TARGET_CC:-${CC}}"
|
||||
export TARGET_CC
|
||||
fi
|
||||
with_platform="--with-platform=efi"
|
||||
;;
|
||||
efi-64)
|
||||
if [[ ${CHOST} == i?86* ]]; then
|
||||
CTARGET="${CTARGET:-x86_64}"
|
||||
TARGET_CC="${TARGET_CC:-${CC}}"
|
||||
TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
|
||||
TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
|
||||
export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
|
||||
fi
|
||||
with_platform="--with-platform=efi"
|
||||
;;
|
||||
guessed) ;;
|
||||
*)
|
||||
with_platform="--with-platform=${platform}"
|
||||
case ${CTARGET:-${CHOST}} in
|
||||
i?86*|x86_64*)
|
||||
enable_efiemu=$(use_enable efiemu)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
ECONF_SOURCE="${S}" \
|
||||
econf \
|
||||
--libdir=/usr/lib \
|
||||
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
|
||||
--disable-werror \
|
||||
--program-prefix= \
|
||||
${with_platform} \
|
||||
$(use_enable debug mm-debug) \
|
||||
$(use_enable debug grub-emu-usb) \
|
||||
$(use_enable device-mapper) \
|
||||
${enable_efiemu} \
|
||||
$(use_enable mount grub-mount) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable truetype grub-mkfont) \
|
||||
$(use_enable libzfs) \
|
||||
$(use sdl && use_enable debug grub-emu-sdl)
|
||||
|
||||
estack_pop CTARGET CTARGET || die
|
||||
estack_pop TARGET_CC TARGET_CC || die
|
||||
estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
|
||||
estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
|
||||
}
|
||||
|
||||
grub_src_compile() {
|
||||
default_src_compile
|
||||
pax-mark -mpes "${grub_binaries[@]}"
|
||||
}
|
||||
|
||||
grub_build_docs() {
|
||||
emake -C docs html
|
||||
}
|
||||
|
||||
grub_src_install() {
|
||||
default_src_install
|
||||
}
|
||||
|
||||
grub_install_docs() {
|
||||
emake -C docs DESTDIR="${D}" install-html
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
# Bug 439082
|
||||
if $(tc-getLD) --version | grep -q "GNU gold"; then
|
||||
eerror "GRUB does not function correctly when built with the gold linker."
|
||||
eerror "Please select the bfd linker with binutils-config."
|
||||
die "GNU gold detected"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
|
||||
epatch "${FILESDIR}/${P}-no-gets.patch" #424703
|
||||
epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
|
||||
epatch "${FILESDIR}/${P}-tftp-endian.patch" # 438612
|
||||
epatch "${FILESDIR}/${P}-hardcoded-awk.patch" #424137
|
||||
epatch "${FILESDIR}/${P}-freebsd.patch" #442050
|
||||
epatch "${FILESDIR}/${P}-compression.patch" #424527
|
||||
epatch "${FILESDIR}/${P}-zfs-feature-flag-support.patch" #455358
|
||||
fi
|
||||
|
||||
# fix texinfo file name, bug 416035
|
||||
sed -i \
|
||||
-e 's/^\* GRUB:/* GRUB2:/' \
|
||||
-e 's/(grub)/(grub2)/' -- \
|
||||
"${S}"/docs/grub.texi
|
||||
|
||||
epatch_user
|
||||
|
||||
# autogen.sh does more than just run autotools
|
||||
if [[ -n ${DO_AUTORECONF} ]] ; then
|
||||
sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
|
||||
(
|
||||
autopoint() { :; }
|
||||
. ./autogen.sh
|
||||
) || die
|
||||
fi
|
||||
|
||||
# install into the right dir for eselect #372735
|
||||
sed -i \
|
||||
-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
|
||||
util/bash-completion.d/Makefile.in || die
|
||||
|
||||
# get enabled platforms
|
||||
GRUB_ENABLED_PLATFORMS=""
|
||||
local i
|
||||
for i in ${GRUB_PLATFORMS[@]}; do
|
||||
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
|
||||
done
|
||||
[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
|
||||
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local i
|
||||
|
||||
use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
|
||||
use static && append-ldflags -static
|
||||
use elibc_FreeBSD && append-cppflags "-isystem /usr/include"
|
||||
|
||||
# Sandbox bug 404013.
|
||||
use libzfs && addpredict /etc/dfs:/dev/zfs
|
||||
|
||||
multijob_init
|
||||
for i in ${GRUB_ENABLED_PLATFORMS}; do
|
||||
multijob_child_init grub_run_phase ${FUNCNAME} ${i}
|
||||
done
|
||||
multijob_finish || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Used for pax marking in grub_src_compile
|
||||
local grub_binaries=(
|
||||
grub-editenv
|
||||
grub-fstest
|
||||
grub-menulst2cfg
|
||||
grub-mkimage
|
||||
grub-mklayout
|
||||
grub-mkpasswd-pbkdf2
|
||||
grub-mkrelpath
|
||||
grub-script-check
|
||||
grub-bios-setup
|
||||
grub-ofpathname
|
||||
grub-probe
|
||||
grub-sparc64-setup
|
||||
)
|
||||
use mount && grub_binaries+=( grub-mount )
|
||||
use truetype && grub_binaries+=( grub-mkfont )
|
||||
|
||||
local i
|
||||
|
||||
for i in ${GRUB_ENABLED_PLATFORMS}; do
|
||||
grub_run_phase ${FUNCNAME} ${i}
|
||||
done
|
||||
|
||||
# Just build docs once
|
||||
use doc && grub_run_phase build_docs ${i}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local i
|
||||
|
||||
for i in ${GRUB_ENABLED_PLATFORMS}; do
|
||||
grub_run_phase ${FUNCNAME} ${i}
|
||||
done
|
||||
|
||||
use doc && grub_run_phase install_docs ${i}
|
||||
|
||||
mv "${ED}"usr/share/info/grub{,2}.info || die
|
||||
|
||||
# can't be in docs array as we use default_src_install in different builddir
|
||||
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
insinto /etc/default
|
||||
newins "${FILESDIR}"/grub.default-2 grub
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
has_version "<sys-boot/grub-2.00-r2:2" && \
|
||||
[[ "$(df -TP /boot | awk 'NR>1{print $2}')" = 'zfs' ]]
|
||||
display_zfs_feature_flag_warning=$?
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# display the link to guide
|
||||
elog "For information on how to configure grub-2 please refer to the guide:"
|
||||
elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
|
||||
if ! has_version sys-boot/os-prober; then
|
||||
elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig."
|
||||
fi
|
||||
if ! has_version dev-libs/libisoburn; then
|
||||
elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
|
||||
fi
|
||||
if has_version sys-boot/grub:0; then
|
||||
ewarn "If you want to keep GRUB Legacy (grub-0.97) installed, please run"
|
||||
ewarn "the following to add sys-boot/grub:0 to your world file."
|
||||
ewarn "emerge --noreplace sys-boot/grub:0"
|
||||
fi
|
||||
if [[ $display_zfs_feature_flag_warning -eq 0 ]]; then
|
||||
zfs_pool=$(df -TP /boot | awk 'NR>1{print $1}')
|
||||
zfs_pool=${zfs_pool%%/*}
|
||||
ewarn "The previous version of sys-boot/grub lacked support for ZFS feature flags."
|
||||
ewarn "Your /boot is on ZFS. Running \"zpool upgrade ${zfs_pool}\" or \"zpool upgrade -a\""
|
||||
ewarn "to upgrade your pool to support feature flags will prevent your system from booting."
|
||||
ewarn "You should use grub2-install to reinstall your boot code. This will avoid problems."
|
||||
fi
|
||||
}
|
@ -1,367 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r2.ebuild,v 1.5 2013/02/18 16:45:17 mr_bones_ Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
|
||||
LIVE_ECLASS="bzr"
|
||||
SRC_URI=""
|
||||
DO_AUTORECONF="true"
|
||||
else
|
||||
MY_P=${P/_/\~}
|
||||
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
|
||||
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
|
||||
else
|
||||
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
|
||||
mirror://gentoo/${MY_P}.tar.xz"
|
||||
fi
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
DO_AUTORECONF="true"
|
||||
fi
|
||||
|
||||
inherit eutils flag-o-matic multiprocessing pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
|
||||
unset LIVE_ECLASS
|
||||
|
||||
DESCRIPTION="GNU GRUB boot loader"
|
||||
HOMEPAGE="http://www.gnu.org/software/grub/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="2"
|
||||
IUSE="custom-cflags debug device-mapper doc efiemu mount nls static sdl truetype libzfs"
|
||||
|
||||
GRUB_PLATFORMS=(
|
||||
# everywhere:
|
||||
emu
|
||||
# mips only:
|
||||
qemu-mips yeeloong
|
||||
# amd64, x86, ppc, ppc64:
|
||||
ieee1275
|
||||
# amd64, x86:
|
||||
coreboot multiboot efi-32 pc qemu
|
||||
# amd64, ia64:
|
||||
efi-64
|
||||
)
|
||||
IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
|
||||
|
||||
REQUIRED_USE="grub_platforms_qemu? ( truetype )
|
||||
grub_platforms_yeeloong? ( truetype )"
|
||||
|
||||
# os-prober: Used on runtime to detect other OSes
|
||||
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
|
||||
RDEPEND="
|
||||
app-arch/xz-utils
|
||||
>=sys-libs/ncurses-5.2-r5
|
||||
debug? (
|
||||
sdl? ( media-libs/libsdl )
|
||||
)
|
||||
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
|
||||
libzfs? ( sys-fs/zfs )
|
||||
mount? ( sys-fs/fuse )
|
||||
truetype? (
|
||||
media-libs/freetype
|
||||
media-fonts/dejavu
|
||||
>=media-fonts/unifont-5
|
||||
)
|
||||
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
|
||||
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-lang/python-2.5.2
|
||||
sys-devel/flex
|
||||
sys-devel/bison
|
||||
sys-apps/help2man
|
||||
sys-apps/texinfo
|
||||
static? (
|
||||
truetype? (
|
||||
app-arch/bzip2[static-libs(+)]
|
||||
media-libs/freetype[static-libs(+)]
|
||||
sys-libs/zlib[static-libs(+)]
|
||||
)
|
||||
)
|
||||
"
|
||||
RDEPEND+="
|
||||
kernel_linux? (
|
||||
grub_platforms_efi-32? ( sys-boot/efibootmgr )
|
||||
grub_platforms_efi-64? ( sys-boot/efibootmgr )
|
||||
)
|
||||
"
|
||||
if [[ -n ${DO_AUTORECONF} ]] ; then
|
||||
DEPEND+=" >=sys-devel/autogen-5.10"
|
||||
fi
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
DEPEND+=" app-arch/xz-utils"
|
||||
fi
|
||||
|
||||
export STRIP_MASK="*/grub/*/*.{mod,img}"
|
||||
|
||||
QA_EXECSTACK="
|
||||
usr/bin/grub*
|
||||
usr/sbin/grub*
|
||||
usr/lib*/grub/*/*.mod
|
||||
usr/lib*/grub/*/kernel.exec
|
||||
usr/lib*/grub/*/kernel.img
|
||||
usr/lib*/grub/*/setjmp.module
|
||||
"
|
||||
|
||||
QA_WX_LOAD="
|
||||
usr/lib*/grub/*/kernel.exec
|
||||
usr/lib*/grub/*/kernel.img
|
||||
usr/lib*/grub/*/*.image
|
||||
"
|
||||
|
||||
QA_PRESTRIPPED="
|
||||
usr/lib.*/grub/.*/kernel.img
|
||||
"
|
||||
|
||||
grub_run_phase() {
|
||||
local phase=$1
|
||||
local platform=$2
|
||||
[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
|
||||
|
||||
[[ -d "${WORKDIR}/build-${platform}" ]] || \
|
||||
{ mkdir "${WORKDIR}/build-${platform}" || die ; }
|
||||
pushd "${WORKDIR}/build-${platform}" > /dev/null || die
|
||||
|
||||
echo ">>> Running ${phase} for platform \"${platform}\""
|
||||
echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
|
||||
|
||||
grub_${phase} ${platform}
|
||||
|
||||
popd > /dev/null || die
|
||||
}
|
||||
|
||||
grub_src_configure() {
|
||||
local platform=$1
|
||||
local with_platform=
|
||||
local enable_efiemu="--disable-efiemu"
|
||||
|
||||
[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
|
||||
|
||||
# Used below for efi cross-building
|
||||
tc-export CC NM OBJCOPY STRIP
|
||||
|
||||
estack_push CTARGET "${CTARGET}"
|
||||
estack_push TARGET_CC "${TARGET_CC}"
|
||||
estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
|
||||
estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
|
||||
|
||||
case ${platform} in
|
||||
efi-32)
|
||||
if [[ ${CHOST} == x86_64* ]]; then
|
||||
CTARGET="${CTARGET:-i386}"
|
||||
TARGET_CC="${TARGET_CC:-${CC}}"
|
||||
export TARGET_CC
|
||||
fi
|
||||
with_platform="--with-platform=efi"
|
||||
;;
|
||||
efi-64)
|
||||
if [[ ${CHOST} == i?86* ]]; then
|
||||
CTARGET="${CTARGET:-x86_64}"
|
||||
TARGET_CC="${TARGET_CC:-${CC}}"
|
||||
TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
|
||||
TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
|
||||
export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
|
||||
fi
|
||||
with_platform="--with-platform=efi"
|
||||
;;
|
||||
guessed) ;;
|
||||
*)
|
||||
with_platform="--with-platform=${platform}"
|
||||
case ${CTARGET:-${CHOST}} in
|
||||
i?86*|x86_64*)
|
||||
enable_efiemu=$(use_enable efiemu)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
ECONF_SOURCE="${S}" \
|
||||
econf \
|
||||
--libdir=/usr/lib \
|
||||
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
|
||||
--disable-werror \
|
||||
--program-prefix= \
|
||||
${with_platform} \
|
||||
$(use_enable debug mm-debug) \
|
||||
$(use_enable debug grub-emu-usb) \
|
||||
$(use_enable device-mapper) \
|
||||
${enable_efiemu} \
|
||||
$(use_enable mount grub-mount) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable truetype grub-mkfont) \
|
||||
$(use_enable libzfs) \
|
||||
$(use sdl && use_enable debug grub-emu-sdl)
|
||||
|
||||
estack_pop CTARGET CTARGET || die
|
||||
estack_pop TARGET_CC TARGET_CC || die
|
||||
estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
|
||||
estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
|
||||
}
|
||||
|
||||
grub_src_compile() {
|
||||
default_src_compile
|
||||
pax-mark -mpes "${grub_binaries[@]}"
|
||||
}
|
||||
|
||||
grub_build_docs() {
|
||||
emake -C docs html
|
||||
}
|
||||
|
||||
grub_src_install() {
|
||||
default_src_install
|
||||
}
|
||||
|
||||
grub_install_docs() {
|
||||
emake -C docs DESTDIR="${D}" install-html
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
# Bug 439082
|
||||
if $(tc-getLD) --version | grep -q "GNU gold"; then
|
||||
eerror "GRUB does not function correctly when built with the gold linker."
|
||||
eerror "Please select the bfd linker with binutils-config."
|
||||
die "GNU gold detected"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
|
||||
epatch "${FILESDIR}/${P}-no-gets.patch" #424703
|
||||
epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
|
||||
epatch "${FILESDIR}/${P}-tftp-endian.patch" # 438612
|
||||
epatch "${FILESDIR}/${P}-hardcoded-awk.patch" #424137
|
||||
epatch "${FILESDIR}/${P}-freebsd.patch" #442050
|
||||
epatch "${FILESDIR}/${P}-compression.patch" #424527
|
||||
fi
|
||||
|
||||
# fix texinfo file name, bug 416035
|
||||
sed -i \
|
||||
-e 's/^\* GRUB:/* GRUB2:/' \
|
||||
-e 's/(grub)/(grub2)/' -- \
|
||||
"${S}"/docs/grub.texi
|
||||
|
||||
epatch_user
|
||||
|
||||
# autogen.sh does more than just run autotools
|
||||
if [[ -n ${DO_AUTORECONF} ]] ; then
|
||||
sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
|
||||
(
|
||||
autopoint() { :; }
|
||||
. ./autogen.sh
|
||||
) || die
|
||||
fi
|
||||
|
||||
# install into the right dir for eselect #372735
|
||||
sed -i \
|
||||
-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
|
||||
util/bash-completion.d/Makefile.in || die
|
||||
|
||||
# get enabled platforms
|
||||
GRUB_ENABLED_PLATFORMS=""
|
||||
local i
|
||||
for i in ${GRUB_PLATFORMS[@]}; do
|
||||
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
|
||||
done
|
||||
[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
|
||||
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local i
|
||||
|
||||
use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
|
||||
use static && append-ldflags -static
|
||||
use elibc_FreeBSD && append-cppflags "-isystem /usr/include"
|
||||
|
||||
# Sandbox bug 404013.
|
||||
use libzfs && addpredict /etc/dfs:/dev/zfs
|
||||
|
||||
multijob_init
|
||||
for i in ${GRUB_ENABLED_PLATFORMS}; do
|
||||
multijob_child_init grub_run_phase ${FUNCNAME} ${i}
|
||||
done
|
||||
multijob_finish || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Used for pax marking in grub_src_compile
|
||||
local grub_binaries=(
|
||||
grub-editenv
|
||||
grub-fstest
|
||||
grub-menulst2cfg
|
||||
grub-mkimage
|
||||
grub-mklayout
|
||||
grub-mkpasswd-pbkdf2
|
||||
grub-mkrelpath
|
||||
grub-script-check
|
||||
grub-bios-setup
|
||||
grub-ofpathname
|
||||
grub-probe
|
||||
grub-sparc64-setup
|
||||
)
|
||||
use mount && grub_binaries+=( grub-mount )
|
||||
use truetype && grub_binaries+=( grub-mkfont )
|
||||
|
||||
local i
|
||||
|
||||
for i in ${GRUB_ENABLED_PLATFORMS}; do
|
||||
grub_run_phase ${FUNCNAME} ${i}
|
||||
done
|
||||
|
||||
# Just build docs once
|
||||
use doc && grub_run_phase build_docs ${i}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local i
|
||||
|
||||
for i in ${GRUB_ENABLED_PLATFORMS}; do
|
||||
grub_run_phase ${FUNCNAME} ${i}
|
||||
done
|
||||
|
||||
use doc && grub_run_phase install_docs ${i}
|
||||
|
||||
mv "${ED}"usr/share/info/grub{,2}.info || die
|
||||
|
||||
# can't be in docs array as we use default_src_install in different builddir
|
||||
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
insinto /etc/default
|
||||
newins "${FILESDIR}"/grub.default-2 grub
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
has_version "<sys-boot/grub-2.00-r2:2" && \
|
||||
[[ "$(df -TP /boot | awk 'NR>1{print $2}')" = 'zfs' ]]
|
||||
display_zfs_feature_flag_warning=$?
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# display the link to guide
|
||||
elog "For information on how to configure grub-2 please refer to the guide:"
|
||||
elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
|
||||
if ! has_version sys-boot/os-prober; then
|
||||
elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig."
|
||||
fi
|
||||
if ! has_version dev-libs/libisoburn; then
|
||||
elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
|
||||
fi
|
||||
if has_version sys-boot/grub:0; then
|
||||
ewarn "If you want to keep GRUB Legacy (grub-0.97) installed, please run"
|
||||
ewarn "the following to add sys-boot/grub:0 to your world file."
|
||||
ewarn "emerge --noreplace sys-boot/grub:0"
|
||||
fi
|
||||
if [[ $display_zfs_feature_flag_warning -eq 0 ]]; then
|
||||
zfs_pool=$(df -TP /boot | awk 'NR>1{print $1}')
|
||||
zfs_pool=${zfs_pool%%/*}
|
||||
ewarn "The previous version of sys-boot/grub lacked support for ZFS feature flags."
|
||||
ewarn "Your /boot is on ZFS. Running \"zpool upgrade ${zfs_pool}\" or \"zpool upgrade -a\""
|
||||
ewarn "to upgrade your pool to support feature flags will prevent your system from booting."
|
||||
ewarn "You should use grub2-install to reinstall your boot code. This will avoid problems."
|
||||
fi
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>base-system</herd>
|
||||
<use>
|
||||
<flag name='device-mapper'>Enable support for <pkg>sys-fs/device-mapper</pkg></flag>
|
||||
<flag name='multislot'>Allow grub1 and grub2 to be installed simultaneously</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
@ -1,3 +0,0 @@
|
||||
AUX syslinux-4.00-nopie.patch 527 RMD160 485901ad3c55f50c3e3795efd5d2c5b18a406a5a SHA1 44152e5e2afd2d032e148349898ee78d3d9b1eb1 SHA256 d0d4834043d52f73969ca60eb37729ee44d866ecddf13bceacd7c71147698323
|
||||
DIST syslinux-4.03.tar.bz2 4381187 RMD160 11dcf7d0bf58dd8cb4fc573212f9206bfb81a472 SHA1 24e260facca404f075485a635f0ddffd6f97fd1a SHA256 c65567e324f9d1f7f794ae8f9578a0292bbd47d7b8d895a004d2f0152d0bda38
|
||||
EBUILD syslinux-4.03.ebuild 1709 RMD160 fe4973a7fd1c1ffd696bed9e92a90c1c3692a289 SHA1 8cd8b11ddcbc589b5f381408d78b9359a23d7682 SHA256 fa8db3b31158047b9612b4aa125338670fe3b189d329b40b50f8f4f76dd48f7c
|
@ -1,12 +0,0 @@
|
||||
diff -ur a/com32/MCONFIG b/com32/MCONFIG
|
||||
--- a/com32/MCONFIG 2010-02-16 23:53:51.000000000 +0100
|
||||
+++ b/com32/MCONFIG 2010-02-18 22:28:18.791609195 +0100
|
||||
@@ -24,6 +24,8 @@
|
||||
GCCOPT += $(call gcc_ok,-freg-struct-return,)
|
||||
GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os
|
||||
GCCOPT += $(call gcc_ok,-fPIE,-fPIC)
|
||||
+GCCOPT += $(call gcc_ok,-nopie,)
|
||||
+GCCOPT += $(call gcc_ok,-fno-pie,)
|
||||
GCCOPT += $(call gcc_ok,-fno-exceptions,)
|
||||
GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,)
|
||||
GCCOPT += $(call gcc_ok,-fno-strict-aliasing,)
|
@ -1,60 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.03.ebuild,v 1.3 2010/12/09 09:56:19 phajdan.jr Exp $
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
|
||||
HOMEPAGE="http://syslinux.zytor.com/"
|
||||
SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 x86"
|
||||
IUSE="custom-cflags"
|
||||
|
||||
RDEPEND="sys-fs/mtools
|
||||
dev-perl/Crypt-PasswdMD5
|
||||
dev-perl/Digest-SHA1"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/nasm"
|
||||
|
||||
S=${WORKDIR}/${P/_/-}
|
||||
|
||||
# This ebuild is a departure from the old way of rebuilding everything in syslinux
|
||||
# This departure is necessary since hpa doesn't support the rebuilding of anything other
|
||||
# than the installers.
|
||||
|
||||
# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
# Fix building on hardened
|
||||
epatch "${FILESDIR}"/${PN}-4.00-nopie.patch
|
||||
|
||||
rm -f gethostip #bug 137081
|
||||
|
||||
# Don't prestrip or override user LDFLAGS, bug #305783
|
||||
local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
|
||||
sample/Makefile utils/Makefile"
|
||||
sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
|
||||
|
||||
if use custom-cflags; then
|
||||
sed -i ${SYSLINUX_MAKEFILES} \
|
||||
-e 's|-g -Os||g' \
|
||||
-e 's|-Os||g' \
|
||||
-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
|
||||
|| die "sed custom-cflags failed"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC=$(tc-getCC) installer || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
|
||||
dodoc README NEWS doc/* || die
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
DIST talloc-2.0.7.tar.gz 370705 RMD160 85d10a317744172402abd930c47eb242f4e24e3b SHA1 fb84ee401b6e094503056b030ce31fcbcc9d06aa SHA256 59e1e8619b44eb820405cf76ab15607c35ac6e3460377016eb43f81bca22768a
|
||||
EBUILD talloc-2.0.7.ebuild 2000 RMD160 b2a5ed5f09ca689ef51085dddf7a619ccdf2a218 SHA1 a633f1a2177520359c9d454bde8e6707824eaf32 SHA256 ae3810194529c276ebb4c770ef7f5abd539c43f21fb1bffff269ee1e7b9c9ac1
|
||||
MISC metadata.xml 412 RMD160 bc4ce1becbf6d6dbf2eef283f818d97e6d8ff4cd SHA1 9535124e040cf03a385425627b3622c06d97bf06 SHA256 732d4c39c6e7ddd2d4768724ae637ebadb6abff069fd3cf16d41778cf9f9c9dc
|
@ -1,13 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>samba</herd>
|
||||
<maintainer>
|
||||
<email>patrick@gentoo.org</email>
|
||||
<name>Patrick Lauer</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="compat">Enable extra compatibility stuff</flag>
|
||||
<flag name="swig">Install interface definitions for <pkg>dev-lang/swig</pkg></flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
@ -1,63 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.7.ebuild,v 1.3 2012/02/25 16:36:22 ago Exp $
|
||||
|
||||
EAPI=3
|
||||
PYTHON_DEPEND="python? 2:2.6"
|
||||
inherit waf-utils python multilib
|
||||
|
||||
DESCRIPTION="Samba talloc library"
|
||||
HOMEPAGE="http://talloc.samba.org/"
|
||||
SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
|
||||
IUSE="compat python"
|
||||
|
||||
RDEPEND="!<sys-libs/talloc-2.0.5"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-libs/libxslt
|
||||
|| ( dev-lang/python:2.7[threads] dev-lang/python:2.6[threads] )"
|
||||
|
||||
WAF_BINARY="${S}/buildtools/bin/waf"
|
||||
|
||||
pkg_setup() {
|
||||
# Make sure the build system will use the right python
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local extra_opts=""
|
||||
|
||||
use compat && extra_opts+=" --enable-talloc-compat1"
|
||||
use python || extra_opts+=" --disable-python"
|
||||
waf-utils_src_configure \
|
||||
${extra_opts}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
waf-utils_src_install
|
||||
|
||||
# waf is stupid, and no, we can't fix the build-system, since it's provided
|
||||
# as a brilliant binary blob thats decompressed on the fly
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
install_name_tool \
|
||||
-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
|
||||
"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
|
||||
if use python ; then
|
||||
install_name_tool \
|
||||
-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
|
||||
"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
|
||||
install_name_tool \
|
||||
-change "${S}/bin/default/libtalloc.dylib" \
|
||||
"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
|
||||
"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
|
||||
install_name_tool \
|
||||
-change "${S}/bin/default/libtalloc.dylib" \
|
||||
"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
|
||||
"${ED}"$(python_get_sitedir)/talloc.bundle || die
|
||||
fi
|
||||
fi
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
# ChangeLog for sys-process/ioping
|
||||
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v3
|
||||
# $Header: $
|
||||
|
||||
*ioping-0.4 (07 Jun 2011)
|
||||
|
||||
06 Jun 2011; Dmitry 'daks' Fomenko <daks12@gmail.com>
|
||||
+ioping-0.4.ebuild:
|
||||
Initial ebuild
|
@ -1,4 +0,0 @@
|
||||
DIST ioping-0.4.tar.gz 5803 RMD160 a55eb348cc1b546df6d23f99f2bab41eb7acd314 SHA1 d52d2608c111ab82095c2d6bf00fb4ab856ef2df SHA256 87100c34d50a27fafb44fd72634bf11947ae0afa8971e0a9919028f1a0749718
|
||||
EBUILD ioping-0.4.ebuild 597 RMD160 31a6bcdd55a8ad13be0ab1c34b9cb3d4d2a777fe SHA1 f4d92b9eab753fd6072a2134c3f6755a07fca5ca SHA256 0986eafe574f1f42f4eab13bbe4eabfb7fa79bed777e3cfc3a9079e8e7d00ea3
|
||||
MISC ChangeLog 241 RMD160 c647f69b1606a0cf68593fe916d8da629cf74659 SHA1 780c35ee382acc5adafde174ee869bfd29c468de SHA256 d8522142ae8272cf41e5577de516ba97cbdd73f62a8d2d5154861f5868d6ad82
|
||||
MISC metadata.xml 261 RMD160 fd6c87fa63054c379e842b826f994dce900bb013 SHA1 471683d4ccc2d0934e4f154b51de1be0435f508b SHA256 c4a2402d01197b6c1a7476c5b2b1ec7552b4acbc7dd51c7d775c4100c6324c8d
|
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=3
|
||||
|
||||
DESCRIPTION="ioping is a simple disk I/O latency monitoring tool"
|
||||
HOMEPAGE="http://kir.sacred.ru/ioping/ http://code.google.com/p/ioping/"
|
||||
SRC_URI="http://ioping.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_compile() {
|
||||
mv Makefile Makefile.orig
|
||||
sed -e "s/PREFIX=\/usr\/local/PREFIX=\/usr/" Makefile.orig > Makefile
|
||||
emake || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin ${PN}
|
||||
doman ${PN}.1
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>no-herd</herd>
|
||||
<maintainer>
|
||||
<email>daks12@gmail.com</email>
|
||||
<name>Dmitry 'daks' Fomenko</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
@ -1,2 +0,0 @@
|
||||
EBUILD linux-sources-1.ebuild 838 SHA256 fb777850a7362387398128b5ef0c0801e1113c5f78910dfeedfa9861be98a392 SHA512 92de2129b8acf54871a30c0ebfaf0bcc7e4ceddffd716ad4d8cd757fb9241b18e753102b292bbdda9c5c9bbe2906bfbf51a662fc826040fc7cf75c825204776e WHIRLPOOL a8fbeeb3859b51645f99931fddb3c0f661e2508b42b36d65562c3363e90a33f3d9d5251168ad0216074f234c71c2879ad97943d95185dd3f07dee5b0c7ffe871
|
||||
MISC ChangeLog 292 SHA256 256d3b78e727dd9e81a039ccdf89b308d1e37ac50f744980e964a7a3c6e9dd3d SHA512 e4b8f72194eb37065df4f6d3db4337457723d629ed5aaa4e686c1d56c55bafe05a6c180f16d751254a76f4027c2424c0bdc9731c01f8cdadc37c2d6fa399e862 WHIRLPOOL 4ff584569ed51e7c3432a6ffda70bd0a3091479f4f9905628b46e3d2f7d7fc4e089de8ba0de511510f075e91ecda55c6913ed74d13d78c9da461c3fe731f8446
|
@ -1,2 +0,0 @@
|
||||
EBUILD modutils-0-r1.ebuild 489 SHA256 2b803fc2744bcb94c9fb63eb6314de7ebc495bb4ce1443aec084d41a5d8c84cb SHA512 81273ee84b4d68659dc2f8fa7f882f2a10da1a6b1972049796c6885c43b3633dd9e77a2e12e718fc13664beebd3064b93b37287984c2ec28301c22f4822414ba WHIRLPOOL 830ef3d3f7b8a95c9f7a1c77c6e150d77415ce158fbe58e55c0088951ad6089ec56fd7247796b98ecfed53666efaeb40d1c0b4a3840a908c6e94bf42bab9dd93
|
||||
MISC metadata.xml 232 SHA256 fe5b684c60966f83ac49c4bf66cef1409cd29f5eb6d4584818e78ea9746ace7d SHA512 61c9655c22fdfd53bbe17edc84b1f225ed2f1739deeb134a7e9b0aa3e7798b1490444a59ddf842305042588b280db9864a70ae878dc5219fba4813a7ee2bdcee WHIRLPOOL f9a7bcb29fb2b6bb960b8f9424b6c6e86ea8b443cb042d0fe7630d4b269062a4f4c6176cb78d799bf50d9aacd116dff116ff3b8b025b99b57729ecaa90bbb679
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue