Changeset 07ead96 for npl/kernel/initrd/initrd.SlackBuild

Timestamp:

09/26/17 16:36:24 (8 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

a35989d

Parents:

2758a4b (diff), 5fedc40 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'gcc484'

File:

• npl/kernel/initrd/initrd.SlackBuild (modified) (13 diffs)

npl/kernel/initrd/initrd.SlackBuild

@@ -1 +1 @@
 #!/bin/bash
-#Zet hier de dingen bij die je gerebuild wilt hebben bij een nieuwe kernel.
 #NOBUILDROOT
 #DEP:busybox
@@ -27 +26 @@
 #DEP:fping
 #DEP:network_scripts
+#DEP:kmod
+
 
 ##DEP:drv_3w_sas
@@ -39 +40 @@
 
 CWD=`pwd`
-INITROOT=/tmp/initrd.tmp.$$
+INITROOT=/tmp/initrd.tmp
 
 rm -r $INITROOT &>/dev/null
@@ -76 +77 @@
 #net WEL omdat we nf_conntrack nodig zijn voor drbd!
 #rm -r $INITROOT/lib/modules/*/kernel/net || exit 1
-rm -r `find $INITROOT/lib/modules/*/kernel/fs/* -type d -not -name '*fat*' -not -name '*cifs*' -not -name '*fscache*'` 
+rm -r `find $INITROOT/lib/modules/*/kernel/fs/* -type d -not -name '*fat*' -not -name '*cifs*' -not -name '*fscache*'`
 #rm -r $INITROOT/lib/modules/*/kernel/drivers/usb/serial || exit 1
 #rm -r $INITROOT/lib/modules/*/kernel/drivers/usb/storage || exit 1
@@ -118 +119 @@
 installpkg `../../findpkg v86d` || exit 1
 #installpkg `../../findpkg gcc` || exit 1
+#only need S-theme:
+rm -rf $INITROOT/etc/splash/{B,A,H,E,P,V,K,X} || exit 1
+
+
 
 #installpkg `../../findpkg libtermcap` || exit 1
@@ -125 +130 @@
 
 #de echte modprobe ivm modaliassen
-#installpkg `../../findpkg module_init_tools` || exit 1
-TGZ=`../../findpkg module_init_tools` || exit 1
+TGZ=`../../findpkg kmod` || exit 1
 (
         cd $INITROOT &&
-        tar -xzf "$TGZ" 'sbin/modprobe'
+        rm sbin/modprobe sbin/depmod &>/dev/null &&
+        tar -xzf "$TGZ" 'sbin/kmod' &&
+        ln -s /sbin/kmod sbin/modprobe &&
+        ln -s /sbin/kmod sbin/depmod
 ) || exit 1
 
@@ -139 +146 @@
         mv etc/passwd.new etc/passwd &&
         mv etc/group.new etc/group &&
-        mv etc/shadow.new etc/shadow 
+        mv etc/shadow.new etc/shadow
 ) || exit 1
 
@@ -163 +170 @@
 #(
 #       cd $INITROOT
-#       tar -xzf $TGZ usr/bin/eject 
+#       tar -xzf $TGZ usr/bin/eject
 #) || exit 1
 
@@ -173 +180 @@
 #(
 #       cd $INITROOT
-#       tar -xzf $TGZ usr/sbin/mount.cifs  
+#       tar -xzf $TGZ usr/sbin/mount.cifs
 #) || exit 1
 
@@ -189 +196 @@
 echo "Version $VERSION"
 
-####################depmod runnen 
+####################depmod runnen
 #hiervoor moeten we ff tijdelijk depmod installen
 
 # workaround for bug or feature in modprobe. modprobe looks in the 'extra' dir first, but busyboxs modprobe doesnt:
-pushd $INITROOT/lib/modules/$VERSION/extra || exit 1
-for EMOD in *; do
-    OMOD=`find $INITROOT/lib/modules/$VERSION -name $EMOD |grep -v extra`
-    if [ "$OMOD" != "" ];then
-        mv $EMOD $OMOD  || exit 1
-    fi
-done
-popd
-
-
-TGZ=`../../findpkg module_init_tools` || exit 1
-(
-        cd $INITROOT &&
-        tar -xzf $TGZ --wildcards '*sbin/depmod*'
-) || exit 1
+# pushd $INITROOT/lib/modules/$VERSION/extra || exit 1
+# for EMOD in *; do
+#     OMOD=`find $INITROOT/lib/modules/$VERSION -name $EMOD |grep -v extra`
+#     if [ "$OMOD" != "" ];then
+#         mv $EMOD $OMOD  || exit 1
+#     fi
+# done
+# popd
+
+
+#edwin: replaced by kmod, uses one binary for all
+# TGZ=`../../findpkg module_init_tools` || exit 1
+# (
+#       cd $INITROOT &&
+#       tar -xzf $TGZ --wildcards '*sbin/depmod*'
+# ) || exit 1
 echo "Running depmod..."
 chroot $INITROOT /sbin/depmod -e -a $VERSION  || exit 1
-echo "done"
-
-#depmod kan weer weg
-rm $INITROOT/sbin/depmod* 
+# echo "done"
+#
+# #depmod kan weer weg
+# rm $INITROOT/sbin/depmod*
 
 #####################overbodige zooi eruit strippen
@@ -227 +235 @@
 rm `find $INITROOT -type f -name *.static` 2>/dev/null
 rm `find $INITROOT -name *.a` 2>/dev/null
-
+rm -r $INITROOT/usr/share/bash-completion
+rm -r $INITROOT/home
+rm -r $INITROOT/usr/src
 
 
 ####################binaries strippen voor als dit nog niet gebeurd is
 echo "stripping binaries"
-pushd $INITROOT 
+pushd $INITROOT
 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded || exit 1
 find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded || exit 1
@@ -267 +277 @@
 #SIZE=`du -s $INITROOT|cut -f 1` || exit 1
 
-#echo "Size van alles files: $SIZE" 
+#echo "Size van alles files: $SIZE"
 #(( SIZE+=3000 ))
 #echo "* initrd fixen van $SIZE kbytes."
@@ -316 +326 @@
 cd $PKG
 /sbin/makepkg -l y -c n $CWD/$NAME.pkg >/dev/null &&
-echo $VERSION > $CWD/$NAME.version 
+echo $VERSION > $CWD/$NAME.version