[Lunar-commits] CVS: moonbase/kernel/linux-2.6-prepatch BUILD, 1.1,
1.2 CONFIGURE, 1.1, 1.2 DETAILS, 1.3, 1.4 POST_INSTALL, 1.1,
1.2 PRE_BUILD, 1.1, 1.2 BUILD.alpha, 1.1, NONE
Jaime Buffery
nestu at lunar-linux.org
Wed Jan 12 13:19:08 UTC 2005
Update of /var/cvs/lunar/moonbase/kernel/linux-2.6-prepatch
In directory espresso.foo-projects.org:/tmp/cvs-serv18715
Modified Files:
BUILD CONFIGURE DETAILS POST_INSTALL PRE_BUILD
Removed Files:
BUILD.alpha
Log Message:
2.6.10-rc3 -> 2.6.11-rc1- gcc 3.3.3, glibc 2.3.2, headers 2.6.10.0
Some cosmetics to all files.
Removed BUILD.alpha till further notice.
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-prepatch/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD 25 Oct 2004 18:20:21 -0000 1.1
+++ BUILD 12 Jan 2005 13:19:05 -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
- true
+cd /usr/src/linux/
+
+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-prepatch
+
+ cp /usr/src/linux/.config $CONFIG_CACHE/.config-2.6-prepatch
rm -f arch/i386/boot/bzImage
-
+
# 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 &&
- 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}
+ 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-prepatch/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE 25 Oct 2004 18:20:21 -0000 1.1
+++ CONFIGURE 12 Jan 2005 13:19:06 -0000 1.2
@@ -1,60 +1,25 @@
-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
+mquery USE_GRUB "Configure this kernel to load from grub?" n
+if [ "`get_module_config USE_GRUB`" = "y" ]; then
+ set_module_config "USE_LILO" "n" ;
-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
+ mquery CONFIG_GRUB "Configure grub?" n
+else
+ mquery USE_LILO "Configure this kernel to load from lilo?" n
- echo "CONFIG_METHOD=$CONFIG_METHOD" >> $MODULE_CONFIG
+ if [ "`get_module_config USE_LILO`" = "y" ]; then
+ mquery CONFIG_LILO "Configure lilo?" n
+ fi
fi
+mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
-
-if [ ! -f $CONFIG_CACHE/.config.beta ] && [ ! -f $CONFIG_CACHE/.config ]; 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
+if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then
+ set_module_config "PREFER_MENUCONFIG" "n" ;
+else
+ mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
fi
-TEMP=`grep -v "CONFIG_KERNEL=" $MODULE_CONFIG |
- grep -v "CONFIG_LILO=" |
- grep -v "CONFIG_GRUB="`
+unset_module_config CONFIG_KERNEL
+mquery CONFIG_KERNEL "Configure linux kernel?" n
-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
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-prepatch/DETAILS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DETAILS 4 Dec 2004 11:56:27 -0000 1.3
+++ DETAILS 12 Jan 2005 13:19:06 -0000 1.4
@@ -1,18 +1,16 @@
MODULE=linux-2.6-prepatch
- KERNEL_VERSION=2.6.9
- # VERSION=${KERNEL_VERSION}
- VERSION=2.6.10-rc3
+ KERNEL_VERSION=2.6.10
+ VERSION=2.6.11-rc1
SOURCE=linux-${KERNEL_VERSION}.tar.bz2
SOURCE2=patch-${VERSION}.bz2
- SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
+ SOURCE_URL[0]=${KERNEL_URL}/pub/linux/kernel/v2.6/
SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/
SOURCE2_URL=http://www.kernel.org/pub/linux/kernel/v2.6/testing/
- SOURCE_VFY=sha1:dd8f8b0c43b83339a42246d322cb48c6f2323236
- SOURCE2_VFY=sha1:e0ef1eae1a9fc5c002e9e4118389e0e0778ff2fe
+ SOURCE_VFY=sha1:3c83791c20f9a397b287825a9a5984010a07e711
+ SOURCE2_VFY=sha1:61fc798fc5ec92d9ef80f61f1139087140a0c8f8
WEB_SITE=http://www.kernel.org
ENTERED=20041025
- UPDATED=20041204
- KEEP_SOURCE="on"
+ UPDATED=20050112
SHORT="The latest prepatch (rc patch) for the 2.6 kernel tree."
cat << EOF
The latest prepatch (rc patch) for the 2.6 kernel tree.
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-prepatch/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL 25 Oct 2004 18:20:21 -0000 1.1
+++ POST_INSTALL 12 Jan 2005 13:19:06 -0000 1.2
@@ -1,20 +1,11 @@
-case $BOOT_LOADER in
- lilo) update_lilo ${VERSION} ${VERSION} ;;
- grub) update_grub ${VERSION} ${VERSION} ;;
- aboot) update_aboot ${VERSION} ${VERSION} ;;
-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
-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 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
-if module_installed hostap-driver; then lin hostap-driver; fi
+lin -c kernel-reqs
Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-prepatch/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD 25 Oct 2004 18:20:21 -0000 1.1
+++ PRE_BUILD 12 Jan 2005 13:19:06 -0000 1.2
@@ -1,41 +1,44 @@
cd /usr/src
-if [ ! -d linux-${VERSION} ]; then
+if [ ! -d /usr/src/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
+
+ chown root.root linux
+
+ cd linux
+
+ patch_it $SOURCE2 1
- test -n "${KERNEL_VERSION}" && test "${KERNEL_VERSION}" != "${VERSION}" && mv linux-${KERNEL_VERSION} linux-${VERSION}
-
- ln -sf linux-${VERSION} linux
-
- chown root.root /usr/src/linux
- chown -R root.root /usr/src/linux-${VERSION}
-
- cd linux/
-
- patch_it $SOURCE2 1
-
- for config in .config-2.6-prepatch .config.beta
- do
- test -f ${CONFIG_CACHE}/${config} || continue
- cp ${CONFIG_CACHE}/${config} /usr/src/linux/.config
- break
- done
-
+ for config in .config-2.6-prepatch .config.2.6.stable
+ do
+ if [ -f $CONFIG_CACHE/${config} ]; then
+ cp $CONFIG_CACHE/${config} /usr/src/linux/.config
+ message "Importing ${config} as kernel default configuration"
+ else
+ break
+ fi
+ done
+
else
message "Sources found: /usr/src/linux-${VERSION}"
-
+
if [ "`readlink linux`" != "linux-${VERSION}" ]; then
- rm -rf linux
- ln -s linux-${VERSION} linux
+ rm -rf linux
+ ln -s linux-${VERSION} linux
fi
-
+
fi
+
--- BUILD.alpha DELETED ---
More information about the Lunar-commits
mailing list