From d17613609a7f6c04bf63c26dd394bc5a1c1c13da Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 11 Aug 2010 18:27:29 +0200 Subject: foo --- broot.sh | 8 ++++---- chroot-scripts/build-core.sh | 2 ++ tasks/build_core.task.sh | 7 +++++++ tasks/update_chrootscripts.task.sh | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 tasks/build_core.task.sh diff --git a/broot.sh b/broot.sh index dd4d06f..552fff3 100755 --- a/broot.sh +++ b/broot.sh @@ -15,15 +15,15 @@ case $1 in "update") tasks="update update_chrootscripts" ;; - "build-bb") + "build-busybox") tasks="build_busybox" # chroot-exec /root/bin/build-bb.sh ;; "shell") tasks="shell" ;; - "build-initramfs-pkgs") - tasks="build_busybox build_packages build_kernel" + "build-core-pkgs") + tasks="build_core" # updateScripts # chroot-exec /root/bin/build-preboot.sh ;; @@ -43,7 +43,7 @@ case $1 in [ -f $BROOT_BUILDROOT_PATH/.resume ] && . $BROOT_BUILDROOT_PATH/.resume ;; *) - echo "Usage: broot (setup|update|build-bb)" + echo "Usage: broot (setup|update|shell|build-busybox|build-core-pks)" exit 23 esac diff --git a/chroot-scripts/build-core.sh b/chroot-scripts/build-core.sh index 25268eb..d5e14ce 100644 --- a/chroot-scripts/build-core.sh +++ b/chroot-scripts/build-core.sh @@ -1,5 +1,7 @@ #!/bin/bash +. ./pkg-builder.sh + PACKAGES="eglibc kexec dialog dropbear nbd-client iw strace" mkdir -p /root/packages diff --git a/tasks/build_core.task.sh b/tasks/build_core.task.sh new file mode 100644 index 0000000..5cdd3b1 --- /dev/null +++ b/tasks/build_core.task.sh @@ -0,0 +1,7 @@ +build_core_package_dependencies="" + +build_core() { + local ME=build_core + echo " Building core" + chroot-exec /root/bin/build-core.sh >> $BROOT_LOG.$ME +} diff --git a/tasks/update_chrootscripts.task.sh b/tasks/update_chrootscripts.task.sh index 9302fae..64720a3 100644 --- a/tasks/update_chrootscripts.task.sh +++ b/tasks/update_chrootscripts.task.sh @@ -1,6 +1,7 @@ update_chrootscripts () { rm -f $BROOT_BUILDROOT_PATH/root/bin/*.sh 2>&1 > /dev/null - cp ./chroot-scripts/* $BROOT_BUILDROOT_PATH/root/bin/ + rm -rf $BROOT_BUILDROOT_PATH/root/bin/packages + cp -r ./chroot-scripts/* $BROOT_BUILDROOT_PATH/root/bin/ chmod 700 $BROOT_BUILDROOT_PATH/root/bin/* count=$(ls -1 $BROOT_BUILDROOT_PATH/root/bin/*.sh|wc -l) echo " Reinstalled $count scripts" -- cgit v1.2.3-55-g7522