From bb9d889d158e0082f02815b64f9ecd87afadbc0d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 19 May 2015 11:52:14 +0200 Subject: [PATCH] rename & cleanup Signed-off-by: Nico Schottelius --- hacking/.gitignore | 1 + hacking/README | 5 +++++ hacking/{ => v2-initramfs-from-os}/bin_to_pkg.sh | 0 .../{ => v2-initramfs-from-os}/copy_files_for_iso.sh | 0 .../v2-initramfs-from-os/filelist_from_package.sh | 8 +++++--- .../copy_bin_with_libs.sh} | 12 +++++++++--- hacking/v3-busybox/create_initramfs.sh | 2 ++ 7 files changed, 22 insertions(+), 6 deletions(-) rename hacking/{ => v2-initramfs-from-os}/bin_to_pkg.sh (100%) rename hacking/{ => v2-initramfs-from-os}/copy_files_for_iso.sh (100%) rename hacking/{recursive-ldd.sh => v3-busybox/copy_bin_with_libs.sh} (66%) diff --git a/hacking/.gitignore b/hacking/.gitignore index e3f3d036..375edb27 100644 --- a/hacking/.gitignore +++ b/hacking/.gitignore @@ -1,2 +1,3 @@ iso/ *.iso +preos/ diff --git a/hacking/README b/hacking/README index 50ba4616..937564d5 100644 --- a/hacking/README +++ b/hacking/README @@ -2,9 +2,14 @@ - rootfs fix - get working to login - have sshd enabled + - kernel -> initramfs? + http://jootamam.net/howto-initramfs-image.htm + - busybox!! - everything into initramfs? +- permission problem on various files below /etc + - Target: - get working iso - have it configured and gathered by cdist? diff --git a/hacking/bin_to_pkg.sh b/hacking/v2-initramfs-from-os/bin_to_pkg.sh similarity index 100% rename from hacking/bin_to_pkg.sh rename to hacking/v2-initramfs-from-os/bin_to_pkg.sh diff --git a/hacking/copy_files_for_iso.sh b/hacking/v2-initramfs-from-os/copy_files_for_iso.sh similarity index 100% rename from hacking/copy_files_for_iso.sh rename to hacking/v2-initramfs-from-os/copy_files_for_iso.sh diff --git a/hacking/v2-initramfs-from-os/filelist_from_package.sh b/hacking/v2-initramfs-from-os/filelist_from_package.sh index b5dd8eb7..5652ba66 100755 --- a/hacking/v2-initramfs-from-os/filelist_from_package.sh +++ b/hacking/v2-initramfs-from-os/filelist_from_package.sh @@ -8,12 +8,14 @@ gettext glibc grep gzip inetutils iproute2 \ iputils jfsutils less licenses linux logrotate lvm2 \ man-db man-pages mdadm nano pacman pciutils \ - pcmciautils perl procps-ng psmisc reiserfsprogs \ + pcmciautils procps-ng psmisc reiserfsprogs \ s-nail sed shadow sysfsutils systemd-sysvcompat tar \ - texinfo usbutils util-linux vi which xfsprogs \ + usbutils util-linux vi which xfsprogs \ ; do pacman -Qlq $pkg | grep -v \ -e /usr/share/man/ \ - -e /usr/share/doc/ + -e /usr/share/doc/ \ + -e /usr/include + done ) | sort | uniq diff --git a/hacking/recursive-ldd.sh b/hacking/v3-busybox/copy_bin_with_libs.sh similarity index 66% rename from hacking/recursive-ldd.sh rename to hacking/v3-busybox/copy_bin_with_libs.sh index 600df529..b3824a78 100755 --- a/hacking/recursive-ldd.sh +++ b/hacking/v3-busybox/copy_bin_with_libs.sh @@ -6,14 +6,20 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin -pkg=" +#bin_list="udevadm bash fdisk mount syslinux umount rm mv" +bin_list="udevadm fdisk" -bin_list="bash fdisk mount syslinux umount rm mv" +libs=$(mktemp /tmp/cdist-preos-libs.XXXXXXXXXXXXX) + +for bin in bin_list; do -for bin in command_list; do done +rm -f "$libs" + +# lfs +## ldd /bin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted exit 0 diff --git a/hacking/v3-busybox/create_initramfs.sh b/hacking/v3-busybox/create_initramfs.sh index 6d57b05c..f87a7ef6 100755 --- a/hacking/v3-busybox/create_initramfs.sh +++ b/hacking/v3-busybox/create_initramfs.sh @@ -20,6 +20,8 @@ done cd "${initramfs_dir}" find . | cpio -H newc -o | gzip +rm -rf "${initramfs_dir}" + exit 0 # TODO: