[Lunar-commits] CVS: lunar-iso/scripts aaa_base, 1.1, 1.2 etc, 1.2,
1.3 initrd, 1.5, 1.6 isofs, 1.1, 1.2 isolinux, 1.2,
1.3 kernels, 1.10, 1.11 proper, 1.6, 1.7
Auke Kok
sofar at lunar-linux.org
Sun Mar 13 16:04:24 UTC 2005
Update of /var/cvs/lunar/lunar-iso/scripts
In directory espresso.foo-projects.org:/tmp/cvs-serv13221/scripts
Modified Files:
aaa_base etc initrd isofs isolinux kernels proper
Log Message:
Mass commit all my latest changes !!! =^DDDDD
Index: aaa_base
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/aaa_base,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- aaa_base 30 Nov 2004 10:32:54 -0000 1.1
+++ aaa_base 13 Mar 2005 16:04:22 -0000 1.2
@@ -7,20 +7,24 @@
unset VERBOSE
optimize
-echo "+ setting sane ccache limits"
+echo "+ cleaning up file structure"
rm -rf $ISO_TARGET/var/cache/ccache/*
chroot $ISO_TARGET ccache -C
chroot $ISO_TARGET ccache -M 256M
+rm -rf $ISO_TARGET/etc/ssh/ssh_host_*key $ISO_TARGET/etc/ssh/ssh_host_*key.pub
+rmdir /usr/lib/locale/*
# store the list of stuff in /var/cache that needs to be resurrected:
echo "+ creating list of prepackaged modules"
-> $ISO_TARGET/.packages
+> $ISO_SOURCE/aaa_base/packages
for mod in $(cat conf/base.list conf/extended.list) ; do
- grep "^$mod:" $ISO_TARGET/var/state/lunar/packages >> $ISO_TARGET/.packages
+ grep "^$mod:" $ISO_TARGET/var/state/lunar/packages >> $ISO_SOURCE/aaa_base/packages
done
+# add core tools to the list:
+echo "$ISO_LUNAR_MODULE:$ISO_DATE:installed:$ISO_DATE:" >> $ISO_SOURCE/aaa_base/packages
# delete CVS dirs from templates
-find $ISO_TARGET -type d -name "CVS" -exec rm -rf {} \;
+find $ISO_TARGET -type d -name "CVS" -exec rm -rf {} \; &> /dev/null
echo "+ creating aaa_base.tar.bz2"
# gather present files
@@ -30,7 +34,7 @@
# make the tarball
chroot $ISO_TARGET tar cjf /var/cache/lunar/aaa_base.tar.bz2 -T .aaa_base.list --no-recursion
-ls -lh $ISO_TARGET/var/cache/lunar/aaa_base.tar.bz2
+mv $ISO_TARGET/var/cache/lunar/aaa_base.tar.bz2 $ISO_SOURCE/aaa_base/aaa_base.tar.bz2
# clean up
rm $ISO_TARGET/.present $ISO_TARGET/.tracked $ISO_TARGET/.aaa_base.list
Index: etc
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/etc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- etc 23 Nov 2004 13:15:58 -0000 1.2
+++ etc 13 Mar 2005 16:04:22 -0000 1.3
@@ -2,6 +2,11 @@
# big bang: copy everything we need present
cp -a $ISO_SOURCE/template/etc/* $ISO_TARGET/etc/
+chown -R root:root $ISO_TARGET/template/etc
+chmod 0400 $ISO_TARGET/etc/shadow
+chmod 0600 $ISO_TARGET/etc/lilo.conf
+rm -f $ISO_TARGET/etc/mtab
+ln -s /proc/mounts $ISO_TARGET/etc/mtab
# module related stuff
cp $ISO_TARGET/etc/skel/.bash* $ISO_TARGET/root/
@@ -30,6 +35,7 @@
# manual fixes needed before compiling:
[ ! -e $ISO_TARGET/lib/cpp ] && ln -s /usr/bin/cpp $ISO_TARGET/lib/cpp
+[ ! -e $ISO_TARGET/usr/bin/cc ] && ln -s /usr/bin/gcc $ISO_TARGET/usr/bin/cc
[ ! -e $ISO_TARGET/usr/include/gnu/stubs.h ] && mkdir -p $ISO_TARGET/usr/include/gnu && cp /usr/include/gnu/stubs.h $ISO_TARGET/usr/include/gnu/stubs.h
touch $ISO_TARGET/.etcf
Index: initrd
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/initrd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- initrd 4 Feb 2005 12:22:33 -0000 1.5
+++ initrd 13 Mar 2005 16:04:22 -0000 1.6
@@ -4,15 +4,17 @@
cd $ISO_SOURCE/initrd
-umount $ISO_SOURCE/BUILD/dev
-umount $ISO_SOURCE/BUILD/proc
-umount template/dev
-umount template/proc
+umount $ISO_SOURCE/BUILD/dev &> /dev/null
+umount $ISO_SOURCE/BUILD/proc &> /dev/null
+umount template/dev &> /dev/null
+umount template/proc &> /dev/null
rm -rf BUILD
# template first
cp -a --no-dereference template BUILD
+find BUILD -type d -name CVS -exec rm -rf {} \;
+mkdir -p BUILD/mnt
echo "+ copying binaries and required files"
# next up are the required stuff from the BUILD
@@ -21,14 +23,25 @@
cp -a --no-dereference "$ISO_TARGET/$ITEM" "BUILD/$(dirname $ITEM)"
done
echo "+ filling /dev"
+
# bare minimum of device nodes
mkdir -p BUILD/dev
cp -a --no-dereference $ISO_TARGET/etc/makedev.d/* BUILD/etc/makedev.d/
cp template/etc/makedev.d/small BUILD/etc/makedev.d/generic
$ISO_TARGET/dev/MAKEDEV -c BUILD/etc/makedev.d/ -d BUILD/dev generic
-# strip it down even more
+$ISO_TARGET/dev/MAKEDEV -c BUILD/etc/makedev.d/ -d BUILD/dev console
+$ISO_TARGET/dev/MAKEDEV -c BUILD/etc/makedev.d/ -d BUILD/dev tty
( cd BUILD/dev ; rm -f tty[a-zA-Z]* hd[i-z]* s[dg][i-z]* fd[2-9]* fd[0-1][a-zA-Z]* sd[a-z][a-z]* )
+mkdir BUILD/dev/vc
+for node in BUILD/dev/tty* ; do
+ ln -s $node $(echo $node | sed 's:tty:vc/:')
+done
+# strip it down even more
rm -rf BUILD/etc/makedev.d/
+
+# we also generate aaa_dev.tar.bz2 now
+tar cj -C BUILD -f $ISO_SOURCE/aaa_dev/aaa_dev.tar.bz2 dev/
+
echo "+ stripping everything"
for ITEM in $(find BUILD -type f); do
strip $ITEM > /dev/null 2>&1
@@ -38,6 +51,8 @@
done
rm -f BUILD/dev/install-devices.sh
chroot BUILD /sbin/ldconfig
+rm -f BUILD/etc/mtab
+ln -s /proc/mounts BUILD/etc/mtab
# compile the initrd image
for KERNEL in linux safe ; do
Index: isofs
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/isofs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- isofs 22 Nov 2004 20:43:35 -0000 1.1
+++ isofs 13 Mar 2005 16:04:22 -0000 1.2
@@ -1,5 +1,54 @@
#!/bin/bash
+. /etc/lunar/config
+
+echo "+ tagging release version"
+echo "Lunar Linux $ISO_CNAME" > $ISO_TARGET/etc/lunar.release
+
+echo "+ adding kernel modules"
+mkdir -p $ISO_TARGET/kernels
+cp $ISO_SOURCE/kernels/.kernels $ISO_TARGET/
+cp -a $ISO_SOURCE/kernels/TAR/* $ISO_TARGET/kernels/
+tar xj -C $ISO_TARGET -f $ISO_SOURCE/kernels/safe-modules.tar.bz2
+tar xj -C $ISO_TARGET -f $ISO_SOURCE/kernels/linux-modules.tar.bz2
+
+# copy the installed code over:
+echo "+ copying installer program"
+cp lunar-install/init.d/lunar-install $ISO_TARGET/etc/init.d/
+ln -s /etc/init.d/lunar-install $ISO_TARGET/etc/rc2.d/S20lunar-install
+cp lunar-install/sbin/lunar-install $ISO_TARGET/sbin/
+sedit "s:%VERSION%:${ISO_VERSION}:g" $ISO_TARGET/sbin/lunar-install $ISO_TARGET/etc/motd
+sedit "s:%CODENAME%:${ISO_CODENAME}:g" $ISO_TARGET/sbin/lunar-install $ISO_TARGET/etc/motd
+cp $ISO_SOURCE/lunar-install/etc/inittab $ISO_TARGET/etc/
+
+# need more:
+ln -s ../init.d/discover $ISO_TARGET/etc/rcS.d/S30discover
+
+echo "+ adding isolinux code"
+rm -rf $ISO_TARGET/isolinux
+mkdir $ISO_TARGET/isolinux
+
+cp $ISO_SOURCE/initrd/initrd $ISO_TARGET/isolinux/
+cp $ISO_SOURCE/kernels/linux $ISO_TARGET/isolinux/
+cp $ISO_SOURCE/kernels/safe $ISO_TARGET/isolinux/
+cp $ISO_SOURCE/memtest/memtest $ISO_TARGET/isolinux/
+
+cd $ISO_SOURCE/isolinux
+for file in f{1,2,3}.txt boot.cat isolinux.bin isolinux.cfg ; do
+ VERBOSE=off
+ cp $file $ISO_TARGET/isolinux
+ sedit "s:%VERSION%:${ISO_VERSION}:g" $ISO_TARGET/isolinux/f?.txt
+ sedit "s:%CODENAME%:${ISO_CODENAME}:g" $ISO_TARGET/isolinux/f?.txt
+ sedit "s:%KERNEL%:${ISO_KVER}:g" $ISO_TARGET/isolinux/f?.txt
+done
+
+echo "+ copying package listing"
+cp $ISO_SOURCE/aaa_base/packages $ISO_TARGET/.packages
+echo "+ copying aaa_base.tar.bz2"
+cp $ISO_SOURCE/aaa_base/aaa_base.tar.bz2 $ISO_TARGET/var/cache/lunar/
+echo "+ copying aaa_dev.tar.bz2"
+cp $ISO_SOURCE/aaa_dev/aaa_dev.tar.bz2 $ISO_TARGET/var/cache/lunar/
+
cd $ISO_TARGET
touch .lunar-cd
Index: isolinux
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/isolinux,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- isolinux 3 Feb 2005 21:05:12 -0000 1.2
+++ isolinux 13 Mar 2005 16:04:22 -0000 1.3
@@ -11,11 +11,12 @@
cp $ISO_SOURCE/memtest/memtest $ISO_TARGET/isolinux/
cd $ISO_SOURCE/isolinux
-for file in f{1,2,3}.txt boot.cat isolinux.bin isolinux.cfg ; do
+for file in f{1,2,3}.txt boot.cat isolinux.bin isolinux.cfg generate-iso.sh README; do
VERBOSE=off
cp $file $ISO_TARGET/isolinux
sedit "s:%VERSION%:${ISO_VERSION}:g" $ISO_TARGET/isolinux/f?.txt
sedit "s:%CODENAME%:${ISO_CODENAME}:g" $ISO_TARGET/isolinux/f?.txt
+ sedit "s:%KERNEL%:${ISO_KVER}:g" $ISO_TARGET/isolinux/f?.txt
done
Index: kernels
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/kernels,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kernels 4 Feb 2005 12:22:33 -0000 1.10
+++ kernels 13 Mar 2005 16:04:22 -0000 1.11
@@ -63,12 +63,17 @@
mkdir -p $ISO_SOURCE/kernels/BUILD/boot
mkdir -p $ISO_SOURCE/kernels/BUILD/usr/include/linux-$ISO_KVER$1
make INSTALL_MOD_PATH=$ISO_SOURCE/kernels/BUILD modules_install
+ if [ -n "$2" ]; then
+ # we need them on the iso later too
+ tar cjf $ISO_SOURCE/kernels/$2-modules.tar.bz2 -C $ISO_SOURCE/kernels/BUILD lib/modules
+ tar xj -C $ISO_TARGET -f $ISO_SOURCE/kernels/$2-modules.tar.bz2
+ fi
cp arch/i386/boot/bzImage $ISO_SOURCE/kernels/BUILD/boot/$ISO_KVER$1
- if [ -n "$2" ] ; then
+ if [ -n "$2" ]; then
cp arch/i386/boot/bzImage $ISO_SOURCE/kernels/$2
fi
cp System.map $ISO_SOURCE/kernels/BUILD/boot/System.map-$ISO_KVER$1
- if [ -n "$2" ] ; then
+ if [ -n "$2" ]; then
cp System.map $ISO_SOURCE/kernels/$2.map
fi
cp .config $ISO_SOURCE/kernels/BUILD/boot/config-$ISO_KVER$1
@@ -96,34 +101,32 @@
> $ISO_SOURCE/kernels/.kernels
+# required
build -safe-i386 "i386 nosmp lowmem safe" "fix" \
"Very safe i386 (default is i686) minimal kernel (no ACPI, DMA, SMP)" "safe"
+# recommended
build -normal "nosmp lowmem" "fix main" \
"Normal kernel (no SMP) (RECOMMENDED)" "linux"
build -smp-4gb "smp mem" "fix main" \
"Normal SMP kernel with large memory (4GB)"
-build -agr "nosmp lowmem lowlat" "fix main aggressive" \
- "Low latency patch"
+# build -agr "nosmp lowmem lowlat" "fix main aggressive" \
+# "Low latency patch"
build -agr-smp-4gb "smp mem lowlat" "fix main aggressive" \
"Low latency patch, SMP, 4GB"
-build -stb "nosmp lowmem" "fix" \
- "Minimally patched"
-build -stb-smp-4gb "smp mem" "fix" \
- "Minimally patched, SMP, 4GB"
-build -vnl "nosmp lowmem" "" \
- "Unpatched"
+# build -stb "nosmp lowmem" "fix" \
+# "Minimally patched"
+# build -stb-smp-4gb "smp mem" "fix" \
+# "Minimally patched, SMP, 4GB"
+# build -vnl "nosmp lowmem" "" \
+# "Unpatched"
build -vnl-smp-4gb "smp mem" "" \
"Unpatched, SMP, 4GB"
-build -grs "nosmp lowmem grsec" "fix main grsecurity" \
- "Grsecurity patch"
+# build -grs "nosmp lowmem grsec" "fix main grsecurity" \
+# "Grsecurity patch"
build -grs-smp-4gb "smp mem grsec" "fix main grsecurity" \
"Grsecurity patch, SMP, 4GB"
-build -om "nosmp lowmem om" "fix om" \
- "OpenMosix clustering"
+# build -om "nosmp lowmem om" "fix om" \
+# "OpenMosix clustering"
build -om-smp-4gb "smp mem om" "fix om" \
"OpenMosix clustering, SMP, 4GB"
-mkdir -p $ISO_TARGET/kernels
-cp -av $ISO_SOURCE/kernels/TAR/* $ISO_TARGET/kernels/
-mv $ISO_SOURCE/kernels/.kernels $ISO_TARGET/
-
Index: proper
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/proper,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- proper 4 Feb 2005 08:22:42 -0000 1.6
+++ proper 13 Mar 2005 16:04:22 -0000 1.7
@@ -31,17 +31,18 @@
done
echo "+ cleaning out file structure"
-cat $ISO_TARGET/var/log/lunar/install/* | sort | tac | while read LINE; do
- rm -f "$ISO_TARGET$LINE" 2> /dev/null
+for mod in $(cat ${ISO_SOURCE}/conf/extended.list) ; do
+ chroot $ISO_TARGET lrm -n $mod
done
echo "+ cleaning temporary and unneeded files"
rm -rf $ISO_TARGET/var/log/lunar/*/* > /dev/null
rm -f $ISO_TARGET/var/log/ccache > /dev/null
-rm -rf $ISO_TARGET/var/cache/ccache/?
+rm -rf $ISO_TARGET/usr/share/locale/
rm -rf $ISO_TARGET/usr/share/{info,man,doc}/* > /dev/null
+rm -rf $ISO_TARGET/usr/share/vim/vim63/doc
+rm -rf $ISO_TARGET/usr/share/gtk-doc
rm -rf $ISO_TARGET/usr/include > /dev/null
-rm -rf $ISO_TARGET/etc/ssh/ssh_host_*key $ISO_TARGET/etc/ssh/ssh_host_*key.pub
rm -rf $ISO_TARGET/tmp/*
rm -rf $ISO_TARGET/var/tmp/*
rm -rf $ISO_TARGET/var/lock/*
@@ -49,10 +50,19 @@
rm -rf $ISO_TARGET/var/state/lunar/module_history/*
> $ISO_TARGET/var/log/lunar/activity
rm -f $ISO_TARGET/root/.bash_history
+rm -f $ISO_TARGET/{lib,usr/lib}/lib*.a
+rm -f $ISO_TARGET/boot/${ISO_KVER}*
+rm -rf $ISO_TARGET/lib/modules/${ISO_KVER}*
+
+rm -f $ISO_TARGET/etc/mtab
+ln -s /proc/mounts $ISO_TARGET/etc/mtab
# this is a space killer:
echo "+ stripping binaries"
-find $ISO_TARGET -name "*.a" -o -name "*.so*" -exec strip {} \; 2> /dev/null
+find $ISO_TARGET -name "lib*.so*" -exec strip {} \; 2> /dev/null
+
+echo "+ archiving locale"
+cp $ISO_TARGET/var/lib/lunar/moonbase/*/glibc/locales $ISO_TARGET/etc/lunar/local/
# moonbase
echo "+ archiving moonbase"
@@ -62,24 +72,9 @@
rm -rf moonbase
); fi
-# kernel src!
-##echo "+ archiving kernel source"
-##if [ -d $ISO_TARGET/usr/src/linux-${ISO_KVER} ]; then (
-## chroot $ISO_TARGET depmod -F /usr/src/linux/System.map
-## cd $ISO_TARGET/usr/src &&
-## tar cjf linux-${ISO_KVER}.tar.bz2 linux-${ISO_KVER}/
-## rm -rf linux-${ISO_KVER}
-##); fi
-
-# copy the installed code over:
-cp lunar-install/init.d/lunar-install $ISO_TARGET/etc/init.d/
-ln -s /etc/init.d/lunar-install $ISO_TARGET/etc/rc3.d/S20lunar-install
-cp lunar-install/sbin/lunar-install $ISO_TARGET/sbin/
-sedit "s:%VERSION%:${ISO_VERSION}:g" $ISO_TARGET/sbin/lunar-install $ISO_TARGET/etc/motd
-sedit "s:%CODENAME%:${ISO_CODENAME}:g" $ISO_TARGET/sbin/lunar-install $ISO_TARGET/etc/motd
-
-# need more:
-ln -s ../init.d/discover $ISO_TARGET/etc/rcS.d/S30discover
+# core toolset
+echo "+ archiving core tools"
+cp $ISO_SOURCE/cache/${ISO_LUNAR_MODULE}-*.tar.bz2 $ISO_TARGET/var/cache/lunar/
# more more more!
rm -rf $ISO_TARGET/usr/src $ISO_TARGET/var/build
More information about the Lunar-commits
mailing list