[Lunar-commits] r27030 - in lunar-iso/trunk: conf isolinux kernels/conf/2.6 lunar-install/sbin scripts
Stefan Wold
ratler at lunar-linux.org
Wed Dec 24 12:39:42 CET 2008
Author: ratler
Date: 2008-12-24 12:39:42 +0100 (Wed, 24 Dec 2008)
New Revision: 27030
Modified:
lunar-iso/trunk/conf/base.list
lunar-iso/trunk/isolinux/isolinux.bin
lunar-iso/trunk/kernels/conf/2.6/base
lunar-iso/trunk/lunar-install/sbin/lunar-install
lunar-iso/trunk/scripts/isofs
Log:
* Added support for lsb-release
* Removed a few modules in the kernel
* Automaticly skip swap file step if a swap partiation was enabled
* Bumped isolinux.bin
Modified: lunar-iso/trunk/conf/base.list
===================================================================
--- lunar-iso/trunk/conf/base.list 2008-10-14 14:04:57 UTC (rev 27029)
+++ lunar-iso/trunk/conf/base.list 2008-12-24 11:39:42 UTC (rev 27030)
@@ -66,3 +66,4 @@
vim
mdadm
perl
+lsb-release
Modified: lunar-iso/trunk/isolinux/isolinux.bin
===================================================================
(Binary files differ)
Modified: lunar-iso/trunk/kernels/conf/2.6/base
===================================================================
--- lunar-iso/trunk/kernels/conf/2.6/base 2008-10-14 14:04:57 UTC (rev 27029)
+++ lunar-iso/trunk/kernels/conf/2.6/base 2008-12-24 11:39:42 UTC (rev 27030)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27
-# Sun Oct 12 16:46:28 2008
+# Linux kernel version: 2.6.27.7
+# Mon Dec 1 16:26:40 2008
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -277,6 +277,7 @@
CONFIG_VIRT_TO_BUS=y
CONFIG_MMU_NOTIFIER=y
# CONFIG_HIGHPTE is not set
+CONFIG_X86_RESERVE_LOW_64K=y
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
# CONFIG_MTRR_SANITIZER is not set
@@ -2661,7 +2662,6 @@
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
-# CONFIG_USB_ISP1760_PCI is not set
CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -2736,19 +2736,7 @@
CONFIG_USB_SERIAL_IPW=m
# CONFIG_USB_SERIAL_IUU is not set
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
@@ -2777,7 +2765,7 @@
CONFIG_USB_EMI26=m
CONFIG_USB_ADUTUX=m
CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
+# CONFIG_USB_LEGOTOWER is not set
CONFIG_USB_LCD=m
CONFIG_USB_BERRY_CHARGE=m
CONFIG_USB_LED=m
@@ -2793,15 +2781,11 @@
CONFIG_USB_SISUSBVGA=m
# CONFIG_USB_SISUSBVGA_CON is not set
CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
+# CONFIG_USB_TRANCEVIBRATOR is not set
CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
+# CONFIG_USB_TEST is not set
CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
+# CONFIG_USB_ATM is not set
CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
Modified: lunar-iso/trunk/lunar-install/sbin/lunar-install
===================================================================
--- lunar-iso/trunk/lunar-install/sbin/lunar-install 2008-10-14 14:04:57 UTC (rev 27029)
+++ lunar-iso/trunk/lunar-install/sbin/lunar-install 2008-12-24 11:39:42 UTC (rev 27030)
@@ -718,11 +718,14 @@
continue
fi &&
- #case "$FSYS" in
+ case "$FSYS" in
#xfs|jfs|reiserfs)
# msgbox "Selecting XFS, JFS or reiserfs for your root and/or boot filesystem *requires* you to compile a kernel later on with XFS, JFS or reiserfs built in to the kernel. The default pre-compiled lunar-linux kernel will NOT work in your case!"
# ;;
- #esac
+ swap)
+ SWAP_ENABLED=1
+ ;;
+ esac
MNTPNT=$(get_mount_point $FSYS) &&
@@ -785,9 +788,15 @@
if [ -n "$ROOT" ]; then
if (( STEP <= 4 )) ; then
- STEP=5
+ # Skip swapfile step if swap partition was set
+ if [ -n "$SWAP_ENABLED" ]; then
+ S_OK=\\Z2
+ STEP=6
+ else
+ S_OK=
+ STEP=5
+ fi
fi
- S_OK=
T_OK=
M_OK=\\Z2
fi
@@ -1122,6 +1131,8 @@
# some more missing files:
cp /etc/lunar.release $TARGET/etc/
+ cp /etc/lsb-release $TARGET/etc/
+
echo " LUNAR_MODULE=lunar" > $TARGET/etc/lunar/local/config
cp /etc/lunar/local/.config* $TARGET/etc/lunar/local/
Modified: lunar-iso/trunk/scripts/isofs
===================================================================
--- lunar-iso/trunk/scripts/isofs 2008-10-14 14:04:57 UTC (rev 27029)
+++ lunar-iso/trunk/scripts/isofs 2008-12-24 11:39:42 UTC (rev 27030)
@@ -13,6 +13,19 @@
echo "Lunar Linux $ISO_CNAME" > $ISO_TARGET/etc/lunar.release
echo "lunar" > $ISO_TARGET/etc/hostname
+echo "+ tagging lsb release version"
+if [ "x$ISO_MINOR" != "x" ]; then
+ C_VER="${ISO_MAJOR}-${ISO_MINOR}"
+else
+ C_VER=$ISO_MAJOR
+fi
+cat >$ISO_TARGET/etc/lsb-release<<EOF
+DISTRIB_ID="Lunar Linux"
+DISTRIB_RELEASE="$C_VER"
+DISTRIB_CODENAME="$ISO_CODENAME"
+DISTRIB_DESCRIPTION="Lunar Linux $ISO_CNAME"
+EOF
+
echo "+ adding kernel modules"
mkdir -p $ISO_TARGET/kernels
cp -a $ISO_SOURCE/kernels/TAR/* $ISO_TARGET/kernels/
More information about the Lunar-commits
mailing list