* [gentoo-commits] gentoo-x86 commit in sys-boot/grub/files: grub-2.00-10_linux-genkernel.patch
@ 2012-04-07 21:33 Mike Gilbert (floppym)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert (floppym) @ 2012-04-07 21:33 UTC (permalink / raw
To: gentoo-commits
floppym 12/04/07 21:33:13
Added: grub-2.00-10_linux-genkernel.patch
Log:
Add patch to support genkernel initramfs in 10_linux.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?rev=1.1&content-type=text/plain
Index: grub-2.00-10_linux-genkernel.patch
===================================================================
=== modified file 'util/grub.d/10_linux.in'
--- util/grub.d/10_linux.in 2012-03-10 14:21:25 +0000
+++ util/grub.d/10_linux.in 2012-04-07 21:24:06 +0000
@@ -135,7 +135,7 @@
message="$(gettext_printf "Loading Linux %s ..." ${version})"
sed "s/^/$submenu_indentation/" << EOF
echo '$message'
- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+ linux ${rel_dirname}/${basename} ${rootcmd}=${linux_root_device_thisversion} ro ${args}
EOF
if test -n "${initrd}" ; then
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
@@ -181,19 +181,31 @@
alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+ rootcmd=root
initrd=
+ pushd "${dirname}" > /dev/null
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
"initrd-${version}" "initramfs-${version}.img" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
- "initrd-${alt_version}" "initramfs-${alt_version}.img" \
- "initramfs-genkernel-${version}" \
- "initramfs-genkernel-${alt_version}"; do
- if test -e "${dirname}/${i}" ; then
+ "initrd-${alt_version}" "initramfs-${alt_version}.img"; do
+ if test -e "${i}" ; then
initrd="$i"
break
fi
done
+ if [ "x$initrd" = x ]; then
+ for i in "initramfs-genkernel"*"-${version}" \
+ "initramfs-genkernel"*"-${alt_version}"; do
+ if test -e "${i}"; then
+ initrd="$i"
+ rootcmd=real_root
+ break
+ fi
+ done
+ fi
+ popd > /dev/null
+
config=
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
if test -e "${i}" ; then
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub/files: grub-2.00-10_linux-genkernel.patch
@ 2012-04-11 2:41 Mike Gilbert (floppym)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert (floppym) @ 2012-04-11 2:41 UTC (permalink / raw
To: gentoo-commits
floppym 12/04/11 02:41:33
Modified: grub-2.00-10_linux-genkernel.patch
Log:
Remove real_root logic from patch, #411421 by Xake.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?r1=1.1&r2=1.2
Index: grub-2.00-10_linux-genkernel.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-2.00-10_linux-genkernel.patch 7 Apr 2012 21:33:13 -0000 1.1
+++ grub-2.00-10_linux-genkernel.patch 11 Apr 2012 02:41:33 -0000 1.2
@@ -1,49 +1,26 @@
-=== modified file 'util/grub.d/10_linux.in'
---- util/grub.d/10_linux.in 2012-03-10 14:21:25 +0000
-+++ util/grub.d/10_linux.in 2012-04-07 21:24:06 +0000
-@@ -135,7 +135,7 @@
- message="$(gettext_printf "Loading Linux %s ..." ${version})"
- sed "s/^/$submenu_indentation/" << EOF
- echo '$message'
-- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-+ linux ${rel_dirname}/${basename} ${rootcmd}=${linux_root_device_thisversion} ro ${args}
- EOF
- if test -n "${initrd}" ; then
- # TRANSLATORS: ramdisk isn't identifier. Should be translated.
-@@ -181,19 +181,31 @@
- alt_version=`echo $version | sed -e "s,\.old$,,g"`
+--- util/grub.d/10_linux.in
++++ util/grub.d/10_linux.in
+@@ -182,17 +182,19 @@
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-+ rootcmd=root
initrd=
+ pushd "${dirname}" > /dev/null
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
"initrd-${version}" "initramfs-${version}.img" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-- "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+ "initrd-${alt_version}" "initramfs-${alt_version}.img" \
- "initramfs-genkernel-${version}" \
- "initramfs-genkernel-${alt_version}"; do
- if test -e "${dirname}/${i}" ; then
-+ "initrd-${alt_version}" "initramfs-${alt_version}.img"; do
++ "initramfs-genkernel"*"-${version}" \
++ "initramfs-genkernel"*"-${alt_version}"; do
+ if test -e "${i}" ; then
initrd="$i"
break
fi
done
-
-+ if [ "x$initrd" = x ]; then
-+ for i in "initramfs-genkernel"*"-${version}" \
-+ "initramfs-genkernel"*"-${alt_version}"; do
-+ if test -e "${i}"; then
-+ initrd="$i"
-+ rootcmd=real_root
-+ break
-+ fi
-+ done
-+ fi
+ popd > /dev/null
-+
+
config=
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
- if test -e "${i}" ; then
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub/files: grub-2.00-10_linux-genkernel.patch
@ 2012-04-11 19:49 Mike Gilbert (floppym)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert (floppym) @ 2012-04-11 19:49 UTC (permalink / raw
To: gentoo-commits
floppym 12/04/11 19:49:27
Modified: grub-2.00-10_linux-genkernel.patch
Log:
Adjust patch to use uname -m in place of a shell glob.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.3 sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?r1=1.2&r2=1.3
Index: grub-2.00-10_linux-genkernel.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-2.00-10_linux-genkernel.patch 11 Apr 2012 02:41:33 -0000 1.2
+++ grub-2.00-10_linux-genkernel.patch 11 Apr 2012 19:49:27 -0000 1.3
@@ -1,26 +1,41 @@
---- util/grub.d/10_linux.in
-+++ util/grub.d/10_linux.in
-@@ -182,17 +182,19 @@
- linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+=== modified file 'util/grub.d/10_linux.in'
+--- util/grub.d/10_linux.in 2012-03-10 14:21:25 +0000
++++ util/grub.d/10_linux.in 2012-04-11 19:26:45 +0000
+@@ -150,7 +150,8 @@
+ EOF
+ }
- initrd=
-+ pushd "${dirname}" > /dev/null
- for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
+-case x`uname -m` in
++machine=`uname -m`
++case "x$machine" 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
+@@ -161,6 +162,15 @@
+ done` ;;
+ esac
+
++if test "x${GENKERNEL_ARCH-unset}" = xunset; then
++ case "$machine" in
++ i?86) GENKERNEL_ARCH="x86" ;;
++ mips|mips64) GENKERNEL_ARCH="mips" ;;
++ arm*) GENKERNEL_ARCH="arm" ;;
++ *) GENKERNEL_ARCH="$machine" ;;
++ esac
++fi
++
+ prepare_boot_cache=
+ prepare_root_cache=
+ boot_device_id=
+@@ -186,8 +196,8 @@
"initrd-${version}" "initramfs-${version}.img" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
- "initramfs-genkernel-${version}" \
- "initramfs-genkernel-${alt_version}"; do
-- if test -e "${dirname}/${i}" ; then
-+ "initramfs-genkernel"*"-${version}" \
-+ "initramfs-genkernel"*"-${alt_version}"; do
-+ if test -e "${i}" ; then
++ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
++ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+ if test -e "${dirname}/${i}" ; then
initrd="$i"
break
- fi
- done
-+ popd > /dev/null
-
- config=
- for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub/files: grub-2.00-10_linux-genkernel.patch
@ 2012-04-26 0:08 Mike Gilbert (floppym)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert (floppym) @ 2012-04-26 0:08 UTC (permalink / raw
To: gentoo-commits
floppym 12/04/26 00:08:27
Modified: grub-2.00-10_linux-genkernel.patch
Log:
Replace 10_linux patch with the changeset from upstream.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Revision Changes Path
1.4 sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch?r1=1.3&r2=1.4
Index: grub-2.00-10_linux-genkernel.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grub-2.00-10_linux-genkernel.patch 11 Apr 2012 19:49:27 -0000 1.3
+++ grub-2.00-10_linux-genkernel.patch 26 Apr 2012 00:08:27 -0000 1.4
@@ -1,6 +1,5 @@
-=== modified file 'util/grub.d/10_linux.in'
---- util/grub.d/10_linux.in 2012-03-10 14:21:25 +0000
-+++ util/grub.d/10_linux.in 2012-04-11 19:26:45 +0000
+--- util/grub.d/10_linux.in
++++ util/grub.d/10_linux.in
@@ -150,7 +150,8 @@
EOF
}
@@ -11,28 +10,27 @@
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
-@@ -161,6 +162,15 @@
+@@ -161,6 +162,14 @@
done` ;;
esac
-+if test "x${GENKERNEL_ARCH-unset}" = xunset; then
-+ case "$machine" in
++case "$machine" in
+ i?86) GENKERNEL_ARCH="x86" ;;
+ mips|mips64) GENKERNEL_ARCH="mips" ;;
++ mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
+ arm*) GENKERNEL_ARCH="arm" ;;
+ *) GENKERNEL_ARCH="$machine" ;;
-+ esac
-+fi
++esac
+
prepare_boot_cache=
prepare_root_cache=
boot_device_id=
-@@ -186,8 +196,8 @@
- "initrd-${version}" "initramfs-${version}.img" \
+@@ -187,7 +196,9 @@
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
-- "initramfs-genkernel-${version}" \
+ "initramfs-genkernel-${version}" \
- "initramfs-genkernel-${alt_version}"; do
++ "initramfs-genkernel-${alt_version}" \
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
if test -e "${dirname}/${i}" ; then
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-26 0:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-11 19:49 [gentoo-commits] gentoo-x86 commit in sys-boot/grub/files: grub-2.00-10_linux-genkernel.patch Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2012-04-26 0:08 Mike Gilbert (floppym)
2012-04-11 2:41 Mike Gilbert (floppym)
2012-04-07 21:33 Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox