[Lunar-commits] CVS: moonbase/kernel/linux-2.6-ck BUILD, 1.1,
1.2 CONFIGURE, 1.1, 1.2 DEPENDS, 1.1, 1.2 POST_INSTALL, 1.1,
1.2 PRE_BUILD, 1.1, 1.2
Jens Luedicke
perldude at lunar-linux.org
Mon Dec 27 19:09:28 UTC 2004
- Previous message: [Lunar-commits] CVS: moonbase/devel/db4 BUILD,1.10,1.11
- Next message: [Lunar-commits] CVS: moonbase/kernel/linux-2.6-cko BUILD, 1.1,
1.2 CONFIGURE, 1.1, 1.2 DEPENDS, 1.1, 1.2 POST_INSTALL, 1.1,
1.2 PRE_BUILD, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/cvs/lunar/moonbase/kernel/linux-2.6-ck
In directory espresso.foo-projects.org:/tmp/cvs-serv30446/kernel/linux-2.6-ck
Modified Files:
BUILD CONFIGURE DEPENDS POST_INSTALL PRE_BUILD
Log Message:
update linux-2.6-ck and linux-2.6-cko modules
(based on the new linux-2.6 module rewritten by Moe)
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-ck/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD 26 Oct 2004 17:04:17 -0000 1.1
+++ BUILD 27 Dec 2004 19:09:25 -0000 1.2
@@ -1,56 +1,40 @@
-cd /usr/src/linux
-
-while
- case $CONFIG_KERNEL in
- y|Y)
- case $CONFIG_METHOD in
- xconfig )
- if [ "$DISPLAY" ]; then
- make xconfig || make menuconfig || make config
- else
- make menuconfig || make config
- fi
- ;;
-
- menuconfig )
- make menuconfig || make config ;;
-
- config )
- make config ;;
- esac
-
- if query "Repeat $CONFIG_METHOD? " n ; then
- CONFIG_KERNEL=y
- else
- CONFIG_KERNEL=n
- fi
-
- ;;
+(
- *)
- false ;;
- esac
-do
+ while
+ if [ "$CONFIG_KERNEL" == "y" ]; then
+ if [ "$PREFER_XCONFIG" == "y" -a -n "$DISPLAY" ]; then
+ make xconfig || make menuconfig || make config
+ elif [ "$PREFER_MENUCONFIG" == "y" ]; then
+ make menuconfig || make config
+ else
+ make config
+ fi
+ if ! query "Repeat configuration?" n; then
+ CONFIG_KERNEL=n
+ fi
+ else
+ false
+ fi
+ do
true
-done
-
-
-(
- yes n | make oldconfig
- cp .config $CONFIG_CACHE/.config-2.6-ck
- rm -f arch/i386/boot/bzImage
+ done
- # Because parallel make seems not to work, a hack
+) && (
- optimize_make &&
- KMAKES=${MAKES:=1} &&
- make -j${KMAKES} bzImage &&
- make -j${KMAKES} modules &&
- backup_mods_krnl ${VERSION} &&
- prepare_install &&
- make modules_install # &&
+ yes n | make oldconfig
+ LD_PRELOAD= cp .config $CONFIG_CACHE/.config.2.6.stable
+ rm -f arch/i386/boot/bzImage
- cp arch/i386/boot/bzImage /boot/${VERSION}
- cp System.map /boot/System.map-${VERSION}
+ # Because parallel make seems not to work, a hack
+ optimize_make &&
+ KMAKES=${MAKES:=1} &&
+ make -j${KMAKES} bzImage &&
+ make -j${KMAKES} modules &&
+ backup_mods_krnl $VERSION &&
+ prepare_install &&
+ make modules_install &&
+ cp arch/i386/boot/bzImage /boot/$VERSION &&
+ cp System.map /boot/System.map-$VERSION
+
) > $C_FIFO 2>&1
Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-ck/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE 26 Oct 2004 17:04:17 -0000 1.1
+++ CONFIGURE 27 Dec 2004 19:09:25 -0000 1.2
@@ -1,60 +1,6 @@
-if ! grep -q "BOOT_LOADER" $MODULE_CONFIG; then
- # message "The Linux Kernel requires a boot loader"
- message "Choose either GRUB or LILO"
- # BOOT_LOADER=lilo
-
- if query "Use LILO?" y ; then
- BOOT_LOADER=lilo
- else
- BOOT_LOADER=grub
- fi
-
- echo "BOOT_LOADER=$BOOT_LOADER" >> $MODULE_CONFIG
-fi
-
-CONFIG_GRUB="n"
-CONFIG_LILO="n"
-
-if grep -q "BOOT_LOADER=grub" $MODULE_CONFIG && query "Configure grub?" n ; then
- CONFIG_GRUB=y
-fi
-
-if grep -q "BOOT_LOADER=lilo" $MODULE_CONFIG && query "Configure lilo?" n ; then
- CONFIG_LILO=y
-fi
-
-
-if ! grep -q "CONFIG_METHOD=" $MODULE_CONFIG ; then
-
- if query "Do you prefer make menuconfig over make config" y ; then
- CONFIG_METHOD="menuconfig"
- else
- CONFIG_METHOD="config"
- fi
-
- echo "CONFIG_METHOD=$CONFIG_METHOD" >> $MODULE_CONFIG
-fi
-
-
-
-if [ ! -f $CONFIG_CACHE/.config.2.6-ck ] && [ ! -f $CONFIG_CACHE/.config.2.6.stable ]; then
- message "Preparing to make menuconfig."
- CONFIG_KERNEL="y"
-else
- message "Reconfiguration is optional."
-
- if query "Configure linux kernel?" n ; then
- CONFIG_KERNEL=y
- else
- CONFIG_KERNEL=n
- fi
-fi
-
-TEMP=`grep -v "CONFIG_KERNEL=" $MODULE_CONFIG |
- grep -v "CONFIG_LILO=" |
- grep -v "CONFIG_GRUB="`
-
-echo "$TEMP" > $MODULE_CONFIG
-echo "CONFIG_KERNEL=$CONFIG_KERNEL" >> $MODULE_CONFIG
-echo "CONFIG_LILO=$CONFIG_LILO" >> $MODULE_CONFIG
-echo "CONFIG_GRUB=$CONFIG_GRUB" >> $MODULE_CONFIG
+mquery USE_GRUB "Configure this kernel to load from grub?" n
+mquery USE_LILO "Configure this kernel to load from lilo?" n
+mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
+mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
+unset_module_config CONFIG_KERNEL
+mquery CONFIG_KERNEL "Configure linux kernel?" n
Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-ck/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEPENDS 26 Oct 2004 17:04:17 -0000 1.1
+++ DEPENDS 27 Dec 2004 19:09:25 -0000 1.2
@@ -1,10 +1,2 @@
-# must not have an optional depends on tcl-tk because
-# linux being lin from the Install/Rescue ISO will not
-# have tcl-tk installed
-
-# depends $BOOT_LOADER
-#
-# for some modules to be properly compiled (lftp, apmd) linux module
-# must be compiled while there is autconf installed in the system
depends autoconf &&
depends module-init-tools
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-ck/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL 26 Oct 2004 17:04:17 -0000 1.1
+++ POST_INSTALL 27 Dec 2004 19:09:25 -0000 1.2
@@ -1,22 +1,11 @@
-# Done to shorten the boot label for lilo
-LABEL=`echo ${VERSION} | sed 's/-//g'`
-
-case $BOOT_LOADER in
- lilo) update_lilo ${VERSION} ${LABEL} ;;
- grub) update_grub ${VERSION} ${LABEL} ;;
-esac
-
+if [ "$USE_LILO" == "y" ]; then
+ update_lilo $VERSION $VERSION
+else
+ if [ "$USE_GRUB" == "y" ]; then
+ update_grub $VERSION $VERSION
+ fi
+fi
# Reinstall packages that add their own kernel modules
-rm -f $BOOST_LOCK
-if module_installed ftpfs; then lin ftpfs; fi
-if module_installed cvsfs; then lin cvsfs; fi
-if module_installed NVIDIA; then lin NVIDIA; fi
-if module_installed cryptoapi; then lin cryptoapi; fi
-if module_installed pcmcia-cs; then lin -r -c pcmcia-cs; fi
-if module_installed mwavem; then lin mwavem; fi
-if module_installed cipe; then lin cipe; fi
-if module_installed snare-core; then lin snare-core; fi
-if module_installed bluez-kernel; then lin bluez-kernel; fi
-if module_installed submount; then lin submount; fi
+lin -c kernel-reqs
Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-ck/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD 26 Oct 2004 17:04:17 -0000 1.1
+++ PRE_BUILD 27 Dec 2004 19:09:25 -0000 1.2
@@ -1,43 +1,33 @@
-cd /usr/src
+cd $BUILD_DIRECTORY
-if [ ! -d /usr/src/linux-${VERSION} ]; then
+if [ ! -d linux-${VERSION} ]; then
- rm -rf linux-${KERNEL_VERSION} # we remove this one just in case
rm -rf linux-${VERSION}
rm -rf linux
unpack $SOURCE
- # the main kernel tarball unpacks with 2.6.X name, not with the -mm added
- # so, f.e.: linux-2.6.X will be renamed as linux-2.6.X-mmY
-
mv linux-${KERNEL_VERSION} linux-${VERSION}
+ ln -sf linux-${VERSION} linux
- ln -sf linux-${VERSION} linux
-
- chown root.root /usr/src/linux
- chown root.root /usr/src/linux-${VERSION}
- message "Cd into dir"
- sleep 1
- cd /usr/src/linux
+ chown root.root $BUILD_DIRECTORY/linux
+ chown -R root.root $BUILD_DIRECTORY/linux-${VERSION}
- patch_it $SOURCE_CACHE/$SOURCE2 1
+ cd linux/
- if [ -f $CONFIG_CACHE/.config-2.6.ck ]; then
- message "---------------------Using config-2.6.ck------------------"
- cp $CONFIG_CACHE/.config-2.6.ck /usr/src/linux/.config
- elif [ -f $CONFIG_CACHE/.config.2.6.stable ]; then
- message "-------------------Using config-2.6-------------------"
- cp $CONFIG_CACHE/.config.2.6.stable /usr/src/linux/.config
- fi
+ if [ -f $CONFIG_CACHE/.config.2.6.stable ]; then
+ cp $CONFIG_CACHE/.config.2.6.stable $BUILD_DIRECTORY/linux/.config;
+ elif [ -f $CONFIG_CACHE/.config.beta ]; then
+ cp $CONFIG_CACHE/.config.beta $BUILD_DIRECTORY/linux/.config;
+ fi
else
- message "Sources found: /usr/src/linux-${VERSION}"
-
+ message "Sources found: $BUILD_DIRECTORY/linux-${VERSION}"
+
if [ "`readlink linux`" != "linux-${VERSION}" ]; then
- rm -rf linux
+ rm -rf linux
ln -s linux-${VERSION} linux
fi
-
+
fi
- Previous message: [Lunar-commits] CVS: moonbase/devel/db4 BUILD,1.10,1.11
- Next message: [Lunar-commits] CVS: moonbase/kernel/linux-2.6-cko BUILD, 1.1,
1.2 CONFIGURE, 1.1, 1.2 DEPENDS, 1.1, 1.2 POST_INSTALL, 1.1,
1.2 PRE_BUILD, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Lunar-commits
mailing list