diff --git a/busybox-static.spec b/busybox-static.spec index 5ee372e..883b1f4 100644 --- a/busybox-static.spec +++ b/busybox-static.spec @@ -26,8 +26,6 @@ Group: System/Base Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2 Source1: BusyBox.1 Source2: busybox-static.SuSE.config -Source3: mkinitrd-setup.sh -Source4: mkinitrd-boot.sh # other patches Patch100: busybox.install.patch Patch101: busybox-1.18.3-libarchive.patch diff --git a/busybox.changes b/busybox.changes index fb043ec..723e50e 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 9 11:41:36 UTC 2014 - olaf@aepfle.de + +- Remove mkinitrd scripts + ------------------------------------------------------------------- Thu Sep 4 23:43:33 UTC 2014 - andreas.stieger@gmx.de diff --git a/busybox.spec b/busybox.spec index 3844b85..4af998b 100644 --- a/busybox.spec +++ b/busybox.spec @@ -26,8 +26,6 @@ Group: System/Base Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2 Source1: BusyBox.1 Source2: busybox.SuSE.config -Source3: mkinitrd-setup.sh -Source4: mkinitrd-boot.sh # other patches Patch100: busybox.install.patch Patch101: %{name}-1.18.3-libarchive.patch @@ -75,17 +73,6 @@ install applets/install.sh $RPM_BUILD_ROOT/usr/bin/busybox.install install busybox $RPM_BUILD_ROOT/%{_bindir} install -d $RPM_BUILD_ROOT%_mandir/man1 install -m 644 docs/BusyBox.1 $RPM_BUILD_ROOT%_mandir/man1 -install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts -install -m 755 %{S:3} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-busybox.sh -install -m 755 %{S:4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-busybox.sh - -%post -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -exit 0 - -%postun -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -exit 0 %files %defattr(-,root,root) @@ -95,9 +82,5 @@ exit 0 %{_bindir}/busybox.install %dir %{_datadir}/busybox %config %{_datadir}/busybox/busybox.links -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/setup-busybox.sh -/lib/mkinitrd/scripts/boot-busybox.sh %changelog diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh deleted file mode 100644 index ee25c82..0000000 --- a/mkinitrd-boot.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -#%stage: setup -#%if: 1 = 2 -#%programs: busybox - -## this is only a dummy script so we see busybox as a feature in the list diff --git a/mkinitrd-setup.sh b/mkinitrd-setup.sh deleted file mode 100644 index 9b36f81..0000000 --- a/mkinitrd-setup.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# -#%stage: boot -#%depends: progs -# -if use_script busybox; then - if [ ! -x "/usr/bin/busybox" ]; then - echo "[BUSYBOX] No Busybox executable was found" - else - for i in `busybox | grep Curr -A 200 | grep -v "Currently defined f"`; do - DIR=bin - busyfile="${i/,/}" - # skip programs that do not work properly (if they exist) - if [ -e "bin/$busyfile" -o -e "sbin/$busyfile" ]; then - case $busyfile in - # modprobe: breaks udev - # fsck: breaks fsck.ext3 - # umount: does not know -f - # sleep: can only use full integers (no floats) - # init: no need for init in initrd (breaks bootchart) - # cp: missing -v (breaks bootchart) - modprobe|fsck|umount|mount|sleep|init|cp) - continue - ;; - esac - fi - if [ -h "bin/$busyfile" ]; then - # don't process symlinks - continue - elif [ -e "bin/$busyfile" ]; then - verbose "[BUSYBOX] replacing $DIR/$busyfile" - rm -f bin/$busyfile - elif [ -e "sbin/$busyfile" ]; then - DIR=sbin - rm -f sbin/$busyfile - verbose "[BUSYBOX] replacing $DIR/$busyfile" - fi - # we have to remove the copied program files from the - # internal list so we only get shared libs that are - # actually used - declare -i binc - for ((binc=0 ; $binc<${#initrd_bins[@]} ; binc++)); do - ${A##*/} - if [ "${initrd_bins[$binc]##*/}}" = "$busyfile" ]; then - initrd_bins[$binc]='' - fi - done - ln -s ../bin/busybox "$DIR/$busyfile" - done - fi -fi