From be8a7817dd6d73a6c97982cd573d8e6e26b0c601 Mon Sep 17 00:00:00 2001 From: Daniel Gnoutcheff Date: Sun, 29 Mar 2015 11:27:29 -0400 Subject: [PATCH] Create fs-overlay, post-build Setup buildroot filesystem overlay and move our custom scripts/configs into it. Setup a post-build script and have it delete files generated by buildroot that aren't in RescueOS v1.1. This gets us closer to a buildroot configuration that will automatically generate RescueOS images. For now, we're using RescueOS v1.1 as a reference. --- buildrootconfig | 2 ++ etc/fstab | 9 --------- etc/hostname | 1 - etc/passwd- | 1 - {etc => fs-overlay/etc}/init.d/rcS | 0 {etc => fs-overlay/etc}/inittab | 0 {etc => fs-overlay/etc}/passwd | 0 {etc => fs-overlay/etc}/profile | 0 fs-overlay/etc/resolv.conf | 1 + {rescueOS => fs-overlay/rescueOS}/README | 0 {rescueOS => fs-overlay/rescueOS}/charge21.bash | 0 {rescueOS => fs-overlay/rescueOS}/enableftp.sh | 0 {rescueOS => fs-overlay/rescueOS}/enabletelnet.sh | 0 .../rescueOS}/fix-maemo-devnodes.sh | 0 .../rescueOS}/mass-storage-disable.sh | 0 .../rescueOS}/mass-storage-enable.sh | 0 .../rescueOS}/mount-maemo-root.sh | 0 {rescueOS => fs-overlay/rescueOS}/nokia-n900.kmap | Bin {rescueOS => fs-overlay/rescueOS}/rcS | 0 .../rescueOS}/setup-wpa-wifi.sh | 0 .../rescueOS}/shutdown-cleanup | 0 .../rescueOS}/umount-maemo-root.sh | 0 .../rescueOS}/usbnetworking-disable.sh | 0 .../rescueOS}/usbnetworking-enable.sh | 0 {sbin => fs-overlay/sbin}/battery-watchdog | 0 {sbin => fs-overlay/sbin}/mdev.sh | 0 {sbin => fs-overlay/sbin}/stfu | 0 .../usr}/share/udhcpc/default.script | 0 post-build.sh | 14 ++++++++++++++ 29 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 etc/fstab delete mode 100644 etc/hostname delete mode 100644 etc/passwd- rename {etc => fs-overlay/etc}/init.d/rcS (100%) rename {etc => fs-overlay/etc}/inittab (100%) rename {etc => fs-overlay/etc}/passwd (100%) rename {etc => fs-overlay/etc}/profile (100%) create mode 120000 fs-overlay/etc/resolv.conf rename {rescueOS => fs-overlay/rescueOS}/README (100%) rename {rescueOS => fs-overlay/rescueOS}/charge21.bash (100%) rename {rescueOS => fs-overlay/rescueOS}/enableftp.sh (100%) rename {rescueOS => fs-overlay/rescueOS}/enabletelnet.sh (100%) rename {rescueOS => fs-overlay/rescueOS}/fix-maemo-devnodes.sh (100%) rename {rescueOS => fs-overlay/rescueOS}/mass-storage-disable.sh (100%) rename {rescueOS => fs-overlay/rescueOS}/mass-storage-enable.sh (100%) rename {rescueOS => fs-overlay/rescueOS}/mount-maemo-root.sh (100%) rename {rescueOS => fs-overlay/rescueOS}/nokia-n900.kmap (100%) rename {rescueOS => fs-overlay/rescueOS}/rcS (100%) rename {rescueOS => fs-overlay/rescueOS}/setup-wpa-wifi.sh (100%) rename {rescueOS => fs-overlay/rescueOS}/shutdown-cleanup (100%) rename {rescueOS => fs-overlay/rescueOS}/umount-maemo-root.sh (100%) rename {rescueOS => fs-overlay/rescueOS}/usbnetworking-disable.sh (100%) rename {rescueOS => fs-overlay/rescueOS}/usbnetworking-enable.sh (100%) rename {sbin => fs-overlay/sbin}/battery-watchdog (100%) rename {sbin => fs-overlay/sbin}/mdev.sh (100%) rename {sbin => fs-overlay/sbin}/stfu (100%) rename {usr => fs-overlay/usr}/share/udhcpc/default.script (100%) create mode 100755 post-build.sh diff --git a/buildrootconfig b/buildrootconfig index 710aafe..039f514 100644 --- a/buildrootconfig +++ b/buildrootconfig @@ -11,6 +11,8 @@ BR2_TARGET_GENERIC_HOSTNAME="rescueos" BR2_TARGET_GENERIC_ISSUE="Welcome to RescueOS" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set +BR2_ROOTFS_OVERLAY="../N900_RescueOS/fs-overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="../N900_RescueOS/post-build.sh" BR2_PACKAGE_BUSYBOX_CONFIG="../N900_RescueOS/busyboxconfig" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_TAR=y diff --git a/etc/fstab b/etc/fstab deleted file mode 100644 index a2f56ff..0000000 --- a/etc/fstab +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/fstab: static file system information. -# -# -/dev/root / ext2 rw,noauto 0 1 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts defaults,gid=5,mode=620 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 -tmpfs /tmp tmpfs defaults 0 0 -sysfs /sys sysfs defaults 0 0 diff --git a/etc/hostname b/etc/hostname deleted file mode 100644 index d17ff54..0000000 --- a/etc/hostname +++ /dev/null @@ -1 +0,0 @@ -rescueos diff --git a/etc/passwd- b/etc/passwd- deleted file mode 100644 index bcf6e41..0000000 --- a/etc/passwd- +++ /dev/null @@ -1 +0,0 @@ -root:$1$6WxBQ9E9$xc/J67N0/3N1HAsGkVur..:0:0:root:/root:/bin/bash diff --git a/etc/init.d/rcS b/fs-overlay/etc/init.d/rcS similarity index 100% rename from etc/init.d/rcS rename to fs-overlay/etc/init.d/rcS diff --git a/etc/inittab b/fs-overlay/etc/inittab similarity index 100% rename from etc/inittab rename to fs-overlay/etc/inittab diff --git a/etc/passwd b/fs-overlay/etc/passwd similarity index 100% rename from etc/passwd rename to fs-overlay/etc/passwd diff --git a/etc/profile b/fs-overlay/etc/profile similarity index 100% rename from etc/profile rename to fs-overlay/etc/profile diff --git a/fs-overlay/etc/resolv.conf b/fs-overlay/etc/resolv.conf new file mode 120000 index 0000000..c0b2e5e --- /dev/null +++ b/fs-overlay/etc/resolv.conf @@ -0,0 +1 @@ +/run/resolv.conf \ No newline at end of file diff --git a/rescueOS/README b/fs-overlay/rescueOS/README similarity index 100% rename from rescueOS/README rename to fs-overlay/rescueOS/README diff --git a/rescueOS/charge21.bash b/fs-overlay/rescueOS/charge21.bash similarity index 100% rename from rescueOS/charge21.bash rename to fs-overlay/rescueOS/charge21.bash diff --git a/rescueOS/enableftp.sh b/fs-overlay/rescueOS/enableftp.sh similarity index 100% rename from rescueOS/enableftp.sh rename to fs-overlay/rescueOS/enableftp.sh diff --git a/rescueOS/enabletelnet.sh b/fs-overlay/rescueOS/enabletelnet.sh similarity index 100% rename from rescueOS/enabletelnet.sh rename to fs-overlay/rescueOS/enabletelnet.sh diff --git a/rescueOS/fix-maemo-devnodes.sh b/fs-overlay/rescueOS/fix-maemo-devnodes.sh similarity index 100% rename from rescueOS/fix-maemo-devnodes.sh rename to fs-overlay/rescueOS/fix-maemo-devnodes.sh diff --git a/rescueOS/mass-storage-disable.sh b/fs-overlay/rescueOS/mass-storage-disable.sh similarity index 100% rename from rescueOS/mass-storage-disable.sh rename to fs-overlay/rescueOS/mass-storage-disable.sh diff --git a/rescueOS/mass-storage-enable.sh b/fs-overlay/rescueOS/mass-storage-enable.sh similarity index 100% rename from rescueOS/mass-storage-enable.sh rename to fs-overlay/rescueOS/mass-storage-enable.sh diff --git a/rescueOS/mount-maemo-root.sh b/fs-overlay/rescueOS/mount-maemo-root.sh similarity index 100% rename from rescueOS/mount-maemo-root.sh rename to fs-overlay/rescueOS/mount-maemo-root.sh diff --git a/rescueOS/nokia-n900.kmap b/fs-overlay/rescueOS/nokia-n900.kmap similarity index 100% rename from rescueOS/nokia-n900.kmap rename to fs-overlay/rescueOS/nokia-n900.kmap diff --git a/rescueOS/rcS b/fs-overlay/rescueOS/rcS similarity index 100% rename from rescueOS/rcS rename to fs-overlay/rescueOS/rcS diff --git a/rescueOS/setup-wpa-wifi.sh b/fs-overlay/rescueOS/setup-wpa-wifi.sh similarity index 100% rename from rescueOS/setup-wpa-wifi.sh rename to fs-overlay/rescueOS/setup-wpa-wifi.sh diff --git a/rescueOS/shutdown-cleanup b/fs-overlay/rescueOS/shutdown-cleanup similarity index 100% rename from rescueOS/shutdown-cleanup rename to fs-overlay/rescueOS/shutdown-cleanup diff --git a/rescueOS/umount-maemo-root.sh b/fs-overlay/rescueOS/umount-maemo-root.sh similarity index 100% rename from rescueOS/umount-maemo-root.sh rename to fs-overlay/rescueOS/umount-maemo-root.sh diff --git a/rescueOS/usbnetworking-disable.sh b/fs-overlay/rescueOS/usbnetworking-disable.sh similarity index 100% rename from rescueOS/usbnetworking-disable.sh rename to fs-overlay/rescueOS/usbnetworking-disable.sh diff --git a/rescueOS/usbnetworking-enable.sh b/fs-overlay/rescueOS/usbnetworking-enable.sh similarity index 100% rename from rescueOS/usbnetworking-enable.sh rename to fs-overlay/rescueOS/usbnetworking-enable.sh diff --git a/sbin/battery-watchdog b/fs-overlay/sbin/battery-watchdog similarity index 100% rename from sbin/battery-watchdog rename to fs-overlay/sbin/battery-watchdog diff --git a/sbin/mdev.sh b/fs-overlay/sbin/mdev.sh similarity index 100% rename from sbin/mdev.sh rename to fs-overlay/sbin/mdev.sh diff --git a/sbin/stfu b/fs-overlay/sbin/stfu similarity index 100% rename from sbin/stfu rename to fs-overlay/sbin/stfu diff --git a/usr/share/udhcpc/default.script b/fs-overlay/usr/share/udhcpc/default.script similarity index 100% rename from usr/share/udhcpc/default.script rename to fs-overlay/usr/share/udhcpc/default.script diff --git a/post-build.sh b/post-build.sh new file mode 100755 index 0000000..fb12861 --- /dev/null +++ b/post-build.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +set -e + +target="$1" + +delfiles=" \ + $target/etc/init.d/rcK \ + $target/etc/init.d/S20urandom \ + $target/etc/init.d/S40network \ + $target/etc/securetty" +for file in $delfiles ; do + [ -e "$file" ] && rm "$file" || true +done