rendered paste body#
# old_revision [fcd1afad50b8cd806b06a49e3c34db85544ea088]
#
# patch "packages/initrdscripts/files/30-bootmenu.sh"
# from [ffda8669f836bece0b3630e338941750baed9d81]
# to [4655f7ff2f1c2a82bac07aa29333195acff2c459]
#
# patch "packages/initrdscripts/files/80-loopboot.sh"
# from [b7b859d401a0118c57e557ce8fb22b0a185477cd]
# to [64888de37937348c9946a89af85e00af1af6e30c]
#
# patch "packages/initrdscripts/files/init.sh"
# from [28d18ffa609edec8052c315345c34e219a03fa7e]
# to [caa91db06b15617e326d8ba65c4a1d2d41c30184]
#
# patch "packages/initrdscripts/initramfs-module-block_1.0.bb"
# from [7ce2aaa3caaaea18e4f89c97ac9fda1e79b2f1a4]
# to [d12d39a32659e24ae63b44ba050cc7c2686d6fce]
#
# patch "packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb"
# from [a0475e2ec387c4888fecb4616ce43cd064be9b08]
# to [6e7f1fd5a5caf2105f3070e0ec870842a02555d1]
#
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
# from [665b9db27141be2a1f7b3578b4e1576aa298a03d]
# to [078b780af61cc8643458d6e0be6fd23f480acff8]
#
# patch "packages/initrdscripts/initramfs-module-check-modules_1.0.bb"
# from [fbcef5b65fba763e3f80cb8690e058b469db5f03]
# to [95284e652840323b4cb4c894ff114422322a03ee]
#
# patch "packages/initrdscripts/initramfs-module-initfs_1.0.bb"
# from [71d1fee98407e78577c2537c60488436d5a31c88]
# to [ef457665dadaaa6a2c32d5156da1c02244bfbc05]
#
# patch "packages/initrdscripts/initramfs-module-kexecboot_1.0.bb"
# from [3abc34b3ee6e3d179139405a6e7554b2664a3a30]
# to [1bc1a5185f2fdedb48f2c777d6e536fc0ba2538d]
#
# patch "packages/initrdscripts/initramfs-module-loop_1.0.bb"
# from [47c6ca05257d38036fdfc7794cb088db81ea3307]
# to [bed685944fbe33de50439f0ca4aa4a3836397380]
#
# patch "packages/initrdscripts/initramfs-module-nfs_1.0.bb"
# from [6b5e02292ff06a31c6389447680f654c86222185]
# to [1266bb0ff12018121e655c00108eb2cbb6768c3e]
#
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# from [36899b0b286458882b6c7dc82f858b7e130a026e]
# to [2acbefb0b55c42d55115a28af8503f6952fc133b]
#
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh ffda8669f836bece0b3630e338941750baed9d81
+++ packages/initrdscripts/files/30-bootmenu.sh 4655f7ff2f1c2a82bac07aa29333195acff2c459
@@ -83,7 +83,7 @@ while read maj min nblk dev; do
get_partition_type
if [ "$fstype" != "ext2" -a "$fstype" != "ext3" -a "$fstype" != "vfat" -a "$fstype" != "jffs2" ]; then
# Comment following line to show all available block devices regardless of FS (for debug purposes)
- continue
+#continue
true
fi
@@ -146,9 +146,9 @@ fstype=`expr "$sel" : '[^ ]* *\(.*\)'`
path=`expr "$sel" : '[^/]*\([^ ]*\).*'`
fstype=`expr "$sel" : '[^ ]* *\(.*\)'`
-if [ "$dev" == "Shell" ]; then
+if [ "$dev" = "Shell" ]; then
exec /bin/sh
-elif [ "$dev" == "NFS" ]; then
+elif [ "$dev" = "NFS" ]; then
ROOT_DEVICE="/dev/nfs"
CMDLINE="$CMDLINE root=/dev/nfs nfsroot=192.168.2.200:/srv/nfs/oe/image"
elif [ -n "$path" ]; then
@@ -157,7 +157,7 @@ else
else
ROOT_DEVICE="/dev/$dev"
# jffs2 is not recognized by mount automagically
- if [ "$fstype" == "(jffs2)" ]; then
+ if [ "$fstype" = "(jffs2)" ]; then
ROOT_FSTYPE="jffs2"
fi
CMDLINE="$CMDLINE root=$ROOT_DEVICE"
============================================================
--- packages/initrdscripts/files/80-loopboot.sh b7b859d401a0118c57e557ce8fb22b0a185477cd
+++ packages/initrdscripts/files/80-loopboot.sh 64888de37937348c9946a89af85e00af1af6e30c
@@ -34,7 +34,7 @@ if [ "$ROOT_DEVICE" = "/dev/loop" ]; the
loop_num=`expr "$loop_num" + 1`
}
- modprobe loop
+#modprobe loop
loop_num=0
============================================================
--- packages/initrdscripts/files/init.sh 28d18ffa609edec8052c315345c34e219a03fa7e
+++ packages/initrdscripts/files/init.sh caa91db06b15617e326d8ba65c4a1d2d41c30184
@@ -8,13 +8,13 @@ early_setup() {
mkdir /proc
mount -t proc proc /proc
mkdir /mnt
- modprobe -q mtdblock
+# modprobe -q mtdblock
}
dev_setup()
{
echo -n "initramfs: Creating device nodes: "
- grep '^ *[0-9]' /proc/partitions | while read major minor blocks dev
+ cat /proc/partitions | while read major minor blocks dev
do
if [ ! -e /dev/$dev ]; then
echo -n "$dev "
@@ -44,14 +44,16 @@ load_modules() {
if [ -e "$module" ]; then
# Cannot redir to $CONSOLE here easily - may not be set yet
echo "initramfs: Loading $module module"
- source $module
+ . $module
fi
done
}
boot_root() {
cd $BOOT_ROOT
- exec switch_root -c /dev/console $BOOT_ROOT /sbin/init
+ pivot_root . /tmp
+ umount /tmp
+ exec /sbin/init
}
fatal() {
============================================================
--- packages/initrdscripts/initramfs-module-block_1.0.bb 7ce2aaa3caaaea18e4f89c97ac9fda1e79b2f1a4
+++ packages/initrdscripts/initramfs-module-block_1.0.bb d12d39a32659e24ae63b44ba050cc7c2686d6fce
@@ -1,6 +1,6 @@ PR = "r3"
SRC_URI = "file://85-blockboot.sh"
PR = "r3"
-RDEPENDS = "initramfs-uniboot"
+RDEPENDS = "initramfs-uniboot klibc-utils-static-mount klibc-utils-static-sh"
DESCRIPTION = "An initramfs module for booting off normal block devices."
do_install() {
============================================================
--- packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb a0475e2ec387c4888fecb4616ce43cd064be9b08
+++ packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb 6e7f1fd5a5caf2105f3070e0ec870842a02555d1
@@ -1,7 +1,7 @@ DESCRIPTION = "An initramfs module for i
SRC_URI = "file://01-bootldr-buster.sh"
PR = "r2"
DESCRIPTION = "An initramfs module for ignoring bogus kernel commandline from Compaq bootldr"
-RDEPENDS = "initramfs-uniboot"
+RDEPENDS = "initramfs-uniboot klibc-utils-static-cat klibc-utils-static-sleep klibc-utils-static-sh"
do_install() {
install -d ${D}/initrd.d
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb 665b9db27141be2a1f7b3578b4e1576aa298a03d
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb 078b780af61cc8643458d6e0be6fd23f480acff8
@@ -1,9 +1,10 @@ DESCRIPTION = "An initramfs module with
SRC_URI = "file://30-bootmenu.sh"
PR = "r17"
DESCRIPTION = "An initramfs module with UI for selection of boot device."
-RDEPENDS = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
+RDEPENDS = "klibc-utils-static-fstype klibc-utils-static-sh initramfs-uniboot initramfs-module-block \
+ initramfs-module-loop klibc-utils-static-cat"
+#initramfs-module-nfs"
# For VFAT mounting.
-RRECOMMENDS = "kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
do_install() {
install -d ${D}/initrd.d
============================================================
--- packages/initrdscripts/initramfs-module-check-modules_1.0.bb fbcef5b65fba763e3f80cb8690e058b469db5f03
+++ packages/initrdscripts/initramfs-module-check-modules_1.0.bb 95284e652840323b4cb4c894ff114422322a03ee
@@ -1,7 +1,7 @@ DESCRIPTION = "An initramfs module for c
SRC_URI = "file://90-check-modules.sh"
PR = "r0"
DESCRIPTION = "An initramfs module for checking that kernel modules exist in rootfs"
-RDEPENDS = "initramfs-uniboot"
+RDEPENDS = "initramfs-uniboot klibc-utils-static-sh klibc-utils-static-uname"
do_install() {
install -d ${D}/initrd.d
============================================================
--- packages/initrdscripts/initramfs-module-initfs_1.0.bb 71d1fee98407e78577c2537c60488436d5a31c88
+++ packages/initrdscripts/initramfs-module-initfs_1.0.bb ef457665dadaaa6a2c32d5156da1c02244bfbc05
@@ -1,8 +1,8 @@ DESCRIPTION = "An initramfs module for i
SRC_URI = "file://10-initfs.sh"
PR = "r4"
DESCRIPTION = "An initramfs module for initializing filesystems."
-RDEPENDS = "initramfs-uniboot"
-RRECOMMENDS = "kernel-module-vfat kernel-module-ext2"
+RDEPENDS = "initramfs-uniboot klibc-utils-static-sh klibc-utils-static-modprobe"
+RRECOMMENDS = "kernel-module-ext2 kernel-module-jffs2"
do_install() {
install -d ${D}/initrd.d
============================================================
--- packages/initrdscripts/initramfs-module-kexecboot_1.0.bb 3abc34b3ee6e3d179139405a6e7554b2664a3a30
+++ packages/initrdscripts/initramfs-module-kexecboot_1.0.bb 1bc1a5185f2fdedb48f2c777d6e536fc0ba2538d
@@ -1,7 +1,7 @@ DESCRIPTION = "An initramfs module for k
SRC_URI = "file://87-kexecboot.sh"
PR = "r1"
DESCRIPTION = "An initramfs module for kexecing kernel from rootfs."
-RDEPENDS = "initramfs-uniboot kexec-static"
+RDEPENDS = "initramfs-uniboot kexec-static klibc-utils-static-sleep klibc-utils-static-sh"
do_install() {
install -d ${D}/initrd.d
============================================================
--- packages/initrdscripts/initramfs-module-loop_1.0.bb 47c6ca05257d38036fdfc7794cb088db81ea3307
+++ packages/initrdscripts/initramfs-module-loop_1.0.bb bed685944fbe33de50439f0ca4aa4a3836397380
@@ -1,9 +1,10 @@ DESCRIPTION = "An initramfs module for b
SRC_URI = "file://80-loopboot.sh"
PR = "r2"
DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \
mounting it."
-RDEPENDS = "initramfs-uniboot initramfs-module-initfs"
-RRECOMMENDS = "kernel-module-loop kernel-module-vfat"
+RDEPENDS = "initramfs-uniboot klibc-utils-static-losetup klibc-utils-static-mount \
+ klibc-utils-static-sh"
+#RRECOMMENDS = "kernel-module-loop kernel-module-vfat"
do_install() {
install -d ${D}/initrd.d
============================================================
--- packages/initrdscripts/initramfs-module-nfs_1.0.bb 6b5e02292ff06a31c6389447680f654c86222185
+++ packages/initrdscripts/initramfs-module-nfs_1.0.bb 1266bb0ff12018121e655c00108eb2cbb6768c3e
@@ -1,7 +1,7 @@ DESCRIPTION = "An initramfs module for b
SRC_URI = "file://80-nfsboot.sh"
PR = "r2"
DESCRIPTION = "An initramfs module for booting via NFS."
-RDEPENDS = "initramfs-uniboot"
+RDEPENDS = "initramfs-uniboot klibc-utils-static-sh klibc-utils-static-modprobe klibc-utils-static-mount klibc-utils-static-ipconfig"
RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs"
do_install() {
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb 36899b0b286458882b6c7dc82f858b7e130a026e
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb 2acbefb0b55c42d55115a28af8503f6952fc133b
@@ -1,8 +1,8 @@ DESCRIPTON = "A modular initramfs init s
SRC_URI = "file://init.sh"
PR = "r9"
DESCRIPTON = "A modular initramfs init script system."
-RRECOMMENDS = "kernel-module-mtdblock"
-
+#RRECOMMENDS = "kernel-module-mtdblock"
+RDEPENDS = "klibc-utils-static-mkdir klibc-utils-static-mount klibc-utils-static-sleep klibc-utils-static-umount klibc-utils-static-pivot-root klibc-utils-static-mknod"
do_install() {
install -m 0755 ${WORKDIR}/init.sh ${D}/init
}