dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys-boot/egrub: correct small typos

Browse Source 
(Portage version: 2.2.0_alpha4/svn/Linux x86_64)

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2740 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-11-14 15:25:47 +00:00
parent 5edc959ce8
commit 0a83469be2
5 changed files with 40 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys-boot/egrub/ChangeLog
View File

@ -2,6 +2,11 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
14 Nov 2010; Mario Fetka <mario.fetka@gmail.com> egrub-0.97.ebuild,
-files/grub-0.97-egrub-gentoo-1.patch,
+files/grub-0.97-grub-set-default-1.patch, egrub-1.98.ebuild:
correct small typos
*egrub-0.97 (13 Nov 2010) *egrub-0.97 (13 Nov 2010)
13 Nov 2010; Mario Fetka <mario.fetka@gmail.com> +egrub-0.97.ebuild, 13 Nov 2010; Mario Fetka <mario.fetka@gmail.com> +egrub-0.97.ebuild,

8
sys-boot/egrub/Manifest
View File

@ -1,4 +1,4 @@
AUX grub-0.97-egrub-gentoo-1.patch 1970 RMD160 3be5062e48586a46306a20c1af4253d7db5ac895 SHA1 77a2ea66029f2676162fbb4a7b3b334a01b47942 SHA256 1ab8977a85d17769f96afa3386698b19a8eca5ca4276155f82ecf5efcde9c4d9 AUX grub-0.97-grub-set-default-1.patch 1110 RMD160 f2ae90047e1e87519ede9a1f1347cee39333d827 SHA1 2f93976a0f622541ab2bd682cde92ee14363d264 SHA256 d54660722874c6064e3c20be861591fb9baf8187ad7256f741cee05bf7b24cdf
AUX grub-1.96-genkernel.patch 634 RMD160 bc1fdaa51e3f0e3b777a303e0f1c76987c7e69e5 SHA1 e79384a3ac32bfd74c884ead8133b1691a743316 SHA256 8ee327465d9b6d704a78b0c7b31cfdee7c6e7e9f9897e8d0a86198430f0c6ea0 AUX grub-1.96-genkernel.patch 634 RMD160 bc1fdaa51e3f0e3b777a303e0f1c76987c7e69e5 SHA1 e79384a3ac32bfd74c884ead8133b1691a743316 SHA256 8ee327465d9b6d704a78b0c7b31cfdee7c6e7e9f9897e8d0a86198430f0c6ea0
AUX grub-1.98-efi_std_dir-1.patch 1257 RMD160 46f3fff434fee54f05adbad09a2bdfcc73320b5d SHA1 f45fd2f7d2f2c25e922b35cee3d06b7d59f07dcd SHA256 c348128612cc9d39be80a3f4fa4663fa1ed8dd27672494f3c9fcaabc045500c9 AUX grub-1.98-efi_std_dir-1.patch 1257 RMD160 46f3fff434fee54f05adbad09a2bdfcc73320b5d SHA1 f45fd2f7d2f2c25e922b35cee3d06b7d59f07dcd SHA256 c348128612cc9d39be80a3f4fa4663fa1ed8dd27672494f3c9fcaabc045500c9
AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776 AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776
@ -6,7 +6,7 @@ DIST egrub-0.97-patches-1.0.tar.bz2 257780 RMD160 c5a13239d0c8d828a8281a41ceda34
DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
DIST grub-1.98.tar.gz 2449386 RMD160 197fb8d7c673bd67ae81eda53a2baa2968cc1e69 SHA1 e83a2c438f4773a2e272c225983c0145e1ffd641 SHA256 bef2c1892e052967b65aab6aa62ac702c0e50ef8848506eacf3c0b2f5007c614 DIST grub-1.98.tar.gz 2449386 RMD160 197fb8d7c673bd67ae81eda53a2baa2968cc1e69 SHA1 e83a2c438f4773a2e272c225983c0145e1ffd641 SHA256 bef2c1892e052967b65aab6aa62ac702c0e50ef8848506eacf3c0b2f5007c614
DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
EBUILD egrub-0.97.ebuild 8313 RMD160 246d68d3fee060144339c594e2b093870c5a842c SHA1 e4b91d1318c3b1213c7a755f4db83d0414146fc7 SHA256 0c49064f38448a2cdf3f6c3c86db07b8b6600e168114223a2fea9c1ae351e36f EBUILD egrub-0.97.ebuild 7434 RMD160 b31a3d30f8e49508fa0be1736dde19c1b1d45ee8 SHA1 c11f97509b08ce16b56e86e24e1c7724207e0dc4 SHA256 23631835f0e35c976c8f0f38b3a3725cbfc78efac77cdee3af64a96d12ea7470
EBUILD egrub-1.98.ebuild 3362 RMD160 8b2239b69bcad1cbb517ed26badc84289c3825e3 SHA1 0cc96fc568054450709c91006a18d83fb469f703 SHA256 6576964e1469d54990e44bbe9d44e3a84b3402ec61bad83140a0841d054eadb7 EBUILD egrub-1.98.ebuild 3078 RMD160 c014b653e89c536b66940932b6acfce189e630a7 SHA1 8f4d7c2df08ec73e2b4e5fb4d17f17744f605039 SHA256 5cd8780926e98778e8b81ca27ab72c2d6e725087c27235f9d262de67570b22c9
MISC ChangeLog 563 RMD160 f880d297e0f3635078f84a38fd814f44dd83eef1 SHA1 79306f1cb3574f0c3b15ce52e8fb419494918c27 SHA256 2c2cccceeac60289326d84c6987f36e6ae40c7f5218cda2dc0156c9041e1799c MISC ChangeLog 761 RMD160 606582559d9f84157075030288d5e4687dcd5d8f SHA1 e3d3d386cdb3a7e6c95ca4242b0890e3e64bb5fe SHA256 37021fb3990187e5a3f70b8d47dd254e37c3b4431347bc582179309112f8645e
MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3

57
sys-boot/egrub/egrub-0.97.ebuild
View File

@ -25,7 +25,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
IUSE="custom-cflags" IUSE="custom-cflags"
DEPEND="sys-boot/gnu-efi" DEPEND="sys-boot/gnu-efi
!sys-boot/grub"
RDEPEND="sys-boot/efibootmgr RDEPEND="sys-boot/efibootmgr
sys-fs/dosfstools" sys-fs/dosfstools"
PROVIDE="virtual/bootloader" PROVIDE="virtual/bootloader"
@ -50,10 +51,10 @@ src_prepare() {
sed -e "s/^gnuefi_path=.*$/gnuefi_path=\/usr\/$(get_libdir)/g" \ sed -e "s/^gnuefi_path=.*$/gnuefi_path=\/usr\/$(get_libdir)/g" \
-e "s/^LIBGNUEFI=.*$/LIBGNUEFI=\/usr\/$(get_libdir)\/libgnuefi.a/g" \ -e "s/^LIBGNUEFI=.*$/LIBGNUEFI=\/usr\/$(get_libdir)\/libgnuefi.a/g" \
-i "${S}"/configure.in || die "failed to hack gnu-efi patch" -i "${S}"/configure.in || die "failed to hack gnu-efi path"
# rename grub tools to not interfer with grub # rename grub tools to not interfer with grub
epatch "${FILESDIR}"/grub-0.97-egrub-gentoo-1.patch epatch "${FILESDIR}"/grub-0.97-grub-set-default-1.patch
# Grub will not handle a kernel larger than EXTENDED_MEMSIZE Mb as # Grub will not handle a kernel larger than EXTENDED_MEMSIZE Mb as
# discovered in bug 160801. We can change this, however, using larger values # discovered in bug 160801. We can change this, however, using larger values
@ -126,37 +127,29 @@ src_install() {
emake DESTDIR="${D}" install || die emake DESTDIR="${D}" install || die
# bug 330745 # bug 330745
pax-mark -m "${D}"/sbin/egrub pax-mark -m "${D}"/sbin/grub
# dont install nit needed files # dont install not needed files
rm -rf "${D}"/usr/lib rm -rf "${D}"/usr/lib
rm -rf "${D}"/usr/share/man/man1 rm -rf "${D}"/usr/share/man/man1
rm -rf "${D}"/usr/share/info
rm "${D}"/usr/share/man/man8/grub-install.8 rm "${D}"/usr/share/man/man8/grub-install.8
# rename man pages so they dont interfer with the one from grub
mv "${D}"/usr/share/man/man8/{,e}grub-crypt.8
mv "${D}"/usr/share/man/man8/{,e}grub-md5-crypt.8
mv "${D}"/usr/share/man/man8/{,e}grub-terminfo.8
mv "${D}"/usr/share/man/man8/{,e}grub.8
dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
newdoc docs/menu.lst grub.conf.sample newdoc docs/menu.lst grub.conf.sample
dodoc "${FILESDIR}"/grub.conf.gentoo dodoc "${FILESDIR}"/grub.conf.gentoo
prepalldocs prepalldocs
insinto /usr/share/egrub insinto /usr/share/grub
doins "${DISTDIR}"/splash.xpm.gz doins "${DISTDIR}"/splash.xpm.gz
insinto /boot/efi/EFI/grub
doins efi/grub.efi doins efi/grub.efi
} }
setup_boot_dir() { setup_efi_dir() {
local boot_dir=$1 local boot_dir=$1
local dir=${boot_dir} local dir=${boot_dir}
mkdir -p "${dir}" mkdir -p "${dir}"
# fatxx and links ?
#[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot" #[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
dir="${dir}/grub" dir="${dir}/grub"
if [[ ! -e ${dir} ]] ; then if [[ ! -e ${dir} ]] ; then
@ -171,28 +164,16 @@ setup_boot_dir() {
ewarn ewarn
fi fi
# fatxx and links ?
#if [[ ! -e ${dir}/menu.lst ]]; then #if [[ ! -e ${dir}/menu.lst ]]; then
# einfo "Linking from new grub.conf name to menu.lst" # einfo "Linking from new grub.conf name to menu.lst"
# ln -snf grub.conf "${dir}"/menu.lst # ln -snf grub.conf "${dir}"/menu.lst
#fi #fi
#if [[ -e ${dir}/stage2 ]] ; then
# mv "${dir}"/stage2{,.old}
# ewarn "*** IMPORTANT NOTE: you must run grub and install"
# ewarn "the new version's stage1 to your MBR. Until you do,"
# ewarn "stage1 and stage2 will still be the old version, but"
# ewarn "later stages will be the new version, which could"
# ewarn "cause problems such as an unbootable system."
# ewarn "This means you must use either grub-install or perform"
# ewarn "root/setup manually! For more help, see the handbook:"
# ewarn "http://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
# ebeep
#fi
#einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}" #einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}"
einfo "Copying files from /usr/share/egrub to ${dir}" einfo "Copying files from /usr/share/grub to ${dir}"
for x in \ for x in \
"${ROOT}"/usr/share/egrub/* ; do "${ROOT}"/usr/share/grub/* ; do
[[ -f ${x} ]] && cp -p "${x}" "${dir}"/ [[ -f ${x} ]] && cp -p "${x}" "${dir}"/
done done
# "${ROOT}"/lib*/grub/*/* \ # "${ROOT}"/lib*/grub/*/* \
@ -213,7 +194,7 @@ setup_boot_dir() {
egrep \ egrep \
-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
"${grub_config}" | \ "${grub_config}" | \
/sbin/egrub --batch \ /sbin/grub --batch \
--device-map="${dir}"/device.map \ --device-map="${dir}"/device.map \
> /dev/null > /dev/null
fi fi
@ -221,19 +202,19 @@ setup_boot_dir() {
# the grub default commands silently piss themselves if # the grub default commands silently piss themselves if
# the default file does not exist ahead of time # the default file does not exist ahead of time
if [[ ! -e ${dir}/default ]] ; then if [[ ! -e ${dir}/default ]] ; then
egrub-set-default --root-directory="${boot_dir}" default grub-set-default --root-directory="${boot_dir}" default
fi fi
einfo "Grub has been installed to ${boot_dir} successfully." einfo "Grub has been installed to ${boot_dir} successfully."
} }
pkg_postinst() { pkg_postinst() {
if [[ -n ${DONT_MOUNT_BOOT} ]]; then if [[ -n ${DONT_MOUNT_EFI} ]]; then
elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply" elog "WARNING: you have DONT_MOUNT_EFI in effect, so you must apply"
elog "the following instructions for your /boot!" elog "the following instructions for your /boot/efi!"
elog "Neglecting to do so may cause your system to fail to boot!" elog "Neglecting to do so may cause your system to fail to boot!"
elog elog
else else
setup_boot_dir "${ROOT}"/boot/efi/EFI setup_efi_dir "${ROOT}"/boot/efi/EFI
# Trailing output because if this is run from pkg_postinst, it gets mixed into # Trailing output because if this is run from pkg_postinst, it gets mixed into
# the other output. # the other output.
einfo "" einfo ""
@ -254,5 +235,5 @@ pkg_config() {
else else
dir="${GRUB_ALT_INSTALLDIR}" dir="${GRUB_ALT_INSTALLDIR}"
fi fi
setup_boot_dir "${dir}" setup_efi_dir "${dir}"
} }

25
sys-boot/egrub/egrub-1.98.ebuild
View File

@ -29,7 +29,8 @@ RDEPEND=">=sys-libs/ncurses-5.2-r5
sys-boot/efibootmgr sys-boot/efibootmgr
sys-fs/dosfstools" sys-fs/dosfstools"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
dev-lang/ruby" dev-lang/ruby
!sys-boot/grub"
PROVIDE="virtual/bootloader" PROVIDE="virtual/bootloader"
S="${WORKDIR}"/grub-${PV} S="${WORKDIR}"/grub-${PV}
@ -82,21 +83,16 @@ src_install() {
GRUB_DISTRIBUTOR="Gentoo" GRUB_DISTRIBUTOR="Gentoo"
EOF EOF
sed -i "s:grub-install:egrub-install:" "${D}"/sbin/grub-install || die
mv "${D}"/sbin/{,e}grub-install || die
mv "${D}"/sbin/{,e}grub-set-default || die
mv "${D}"/usr/share/man/man8/{,e}grub-install.8 || die
mv "${D}"/usr/share/info/{,e}grub.info || die
if use multislot ; then if use multislot ; then
sed -i "s:egrub-install:egrub2-install:" "${D}"/sbin/egrub-install || die sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
mv "${D}"/sbin/egrub{,2}-install || die mv "${D}"/sbin/grub{,2}-install || die
mv "${D}"/sbin/egrub{,2}-set-default || die mv "${D}"/sbin/grub{,2}-set-default || die
mv "${D}"/usr/share/man/man8/egrub{,2}-install.8 || die mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
mv "${D}"/usr/share/info/egrub{,2}.info || die mv "${D}"/usr/share/info/grub{,2}.info || die
fi fi
} }
setup_boot_dir() { setup_efi_dir() {
local boot_dir=$1 local boot_dir=$1
local dir=${boot_dir}/grub local dir=${boot_dir}/grub
@ -114,8 +110,7 @@ setup_boot_dir() {
pkg_postinst() { pkg_postinst() {
if use multislot ; then if use multislot ; then
elog "You have installed grub2 with USE=multislot, so to coexist" elog "You have installed grub2 with USE=multislot, so to coexist"
elog "with grub1, the grub2 install binary is named grub2-install." elog "with egrub1, the egrub2 install binary is named grub2-install."
fi fi
mkdir "${ROOT}"boot/efi/EFI/grub setup_efi_dir "${ROOT}"boot/efi/EFI
setup_boot_dir "${ROOT}"boot/efi/EFI
} }

33
sys-boot/egrub/files/grub-0.97-egrub-gentoo-1.patch → sys-boot/egrub/files/grub-0.97-grub-set-default-1.patch
View File

@ -8,23 +8,6 @@ diff -uNr grub-0.97.orig//configure.in grub-0.97/configure.in
- util/grub-terminfo]) - util/grub-terminfo])
+ util/grub-terminfo util/grub-set-default ]) + util/grub-terminfo util/grub-set-default ])
AC_OUTPUT AC_OUTPUT
diff -uNr grub-0.97.orig//grub/Makefile.am grub-0.97/grub/Makefile.am
--- grub-0.97.orig//grub/Makefile.am 2010-11-13 15:40:39.000000000 +0100
+++ grub-0.97/grub/Makefile.am 2010-11-13 15:41:30.000000000 +0100
@@ -1,4 +1,4 @@
-sbin_PROGRAMS = grub
+sbin_PROGRAMS = egrub
if SERIAL_SPEED_SIMULATION
SERIAL_FLAGS = -DSUPPORT_SERIAL=1 -DSIMULATE_SLOWNESS_OF_SERIAL=1
@@ -15,5 +15,5 @@
AM_CFLAGS = $(GRUB_CFLAGS)
-grub_SOURCES = main.c asmstub.c efitftp.c
-grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)
+egrub_SOURCES = main.c asmstub.c efitftp.c
+egrub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)
diff -uNr grub-0.97.orig//util/Makefile.am grub-0.97/util/Makefile.am diff -uNr grub-0.97.orig//util/Makefile.am grub-0.97/util/Makefile.am
--- grub-0.97.orig//util/Makefile.am 2010-11-13 15:40:39.000000000 +0100 --- grub-0.97.orig//util/Makefile.am 2010-11-13 15:40:39.000000000 +0100
+++ grub-0.97/util/Makefile.am 2010-11-13 16:16:30.000000000 +0100 +++ grub-0.97/util/Makefile.am 2010-11-13 16:16:30.000000000 +0100
@ -37,23 +20,11 @@ diff -uNr grub-0.97.orig//util/Makefile.am grub-0.97/util/Makefile.am
noinst_SCRIPTS = grub-image mkbimage noinst_SCRIPTS = grub-image mkbimage
EXTRA_DIST = mkbimage EXTRA_DIST = mkbimage
@@ -14,6 +14,18 @@ @@ -14,6 +14,6 @@
else else
-sbin_SCRIPTS = grub-md5-crypt grub-terminfo grub-crypt -sbin_SCRIPTS = grub-md5-crypt grub-terminfo grub-crypt
+sbin_SCRIPTS = egrub-md5-crypt egrub-terminfo egrub-crypt egrub-set-default +sbin_SCRIPTS = grub-md5-crypt grub-terminfo grub-crypt grub-set-default
+
+egrub-md5-crypt:
+ cp grub-md5-crypt egrub-md5-crypt
+
+egrub-terminfo:
+ cp grub-terminfo egrub-terminfo
+
+egrub-crypt:
+ cp grub-crypt egrub-crypt
+
+egrub-set-default:
+ cp grub-set-default egrub-set-default
endif endif