[Lunar-commits] <moonbase> linus-2.6-zen: moved from zbeta to kernel

Duncan Gibson engelsman at lunar-linux.org
Sat Jan 23 13:39:04 CET 2010


commit 7fe1603ce1d84d999c2e3dbcdde7cdea1902694a
Author: Duncan Gibson <engelsman at lunar-linux.org>
Date:   Sat Jan 23 13:39:04 2010 +0100

    linus-2.6-zen: moved from zbeta to kernel
---
 kernel/linux-2.6-zen/BUILD        |   39 +++++++++++++++++++++++++++++++++++++
 kernel/linux-2.6-zen/CONFIGURE    |   11 ++++++++++
 kernel/linux-2.6-zen/DEPENDS      |    3 ++
 kernel/linux-2.6-zen/DETAILS      |   30 ++++++++++++++++++++++++++++
 kernel/linux-2.6-zen/POST_INSTALL |    8 +++++++
 kernel/linux-2.6-zen/PRE_BUILD    |   32 ++++++++++++++++++++++++++++++
 zbeta/linux-2.6-zen/BUILD         |   39 -------------------------------------
 zbeta/linux-2.6-zen/CONFIGURE     |   11 ----------
 zbeta/linux-2.6-zen/DEPENDS       |    3 --
 zbeta/linux-2.6-zen/DETAILS       |   30 ----------------------------
 zbeta/linux-2.6-zen/POST_INSTALL  |    8 -------
 zbeta/linux-2.6-zen/PRE_BUILD     |   32 ------------------------------
 12 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/kernel/linux-2.6-zen/BUILD b/kernel/linux-2.6-zen/BUILD
new file mode 100644
index 0000000..a20e8d3
--- /dev/null
+++ b/kernel/linux-2.6-zen/BUILD
@@ -0,0 +1,39 @@
+(
+
+  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
+
+) && (
+
+  # Needed for x86_64
+  MYARCH="`arch | grep -qw i.86 && echo i386 || arch`"
+
+  echo | make oldconfig
+  LD_PRELOAD= cp .config $CONFIG_CACHE/.config.2.6.stable
+  rm -f arch/${MYARCH}/boot/bzImage
+
+  make ${MAKES:+-j$MAKES} bzImage  &&
+  make ${MAKES:+-j$MAKES} modules  &&
+  backup_mods_krnl $VERSION        &&
+  prepare_install                  &&
+  make modules_install             &&
+  cp arch/${MYARCH}/boot/bzImage /boot/$VERSION-`arch`  &&
+  cp System.map /boot/System.map-$VERSION-`arch`
+
+) > $C_FIFO 2>&1
diff --git a/kernel/linux-2.6-zen/CONFIGURE b/kernel/linux-2.6-zen/CONFIGURE
new file mode 100644
index 0000000..5dbd7cc
--- /dev/null
+++ b/kernel/linux-2.6-zen/CONFIGURE
@@ -0,0 +1,11 @@
+mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
+
+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
+
+unset_module_config CONFIG_KERNEL
+mquery CONFIG_KERNEL "Configure linux kernel?" n
+
diff --git a/kernel/linux-2.6-zen/DEPENDS b/kernel/linux-2.6-zen/DEPENDS
new file mode 100644
index 0000000..8ef0357
--- /dev/null
+++ b/kernel/linux-2.6-zen/DEPENDS
@@ -0,0 +1,3 @@
+depends  autoconf
+depends  module-init-tools
+depends  xz
diff --git a/kernel/linux-2.6-zen/DETAILS b/kernel/linux-2.6-zen/DETAILS
new file mode 100644
index 0000000..36169be
--- /dev/null
+++ b/kernel/linux-2.6-zen/DETAILS
@@ -0,0 +1,30 @@
+          MODULE=linux-2.6-zen
+  KERNEL_VERSION=2.6.32
+     ZEN_VERSION=2
+         VERSION=$KERNEL_VERSION-zen$ZEN_VERSION
+          SOURCE=linux-$KERNEL_VERSION.tar.bz2
+         SOURCE2=$VERSION.patch.lzma
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/linux-$VERSION
+   SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
+   SOURCE_URL[1]=http://kernel.org/pub/linux/kernel/v2.6/
+     SOURCE2_URL=http://downloads.zen-kernel.org/$KERNEL_VERSION/
+      SOURCE_VFY=sha1:410b4fc818023bfef60064e973ff0ab46d3bfb19
+     SOURCE2_VFY=sha1:767fe59a3cb8611a00c681eb01b8e49df9ca311f
+        WEB_SITE=http://www.zen-kernel.org
+         ENTERED=20091218
+         UPDATED=20091218
+           SHORT="2.6 kernel with latest stable Zen patches."
+     KEEP_SOURCE=on
+           TMPFS=off
+
+cat << EOF
+The Zen Kernel is a the result of a collaborative effort of kernel
+hackers to provide the best Linux kernel possible for every day
+systems. We include code that is not included in the mainline kernel
+in an attempt to create an all-around better kernel for desktops
+(although it can be compiled otherwise). This is done by including
+new features, supporting latest hardware, and including various code
+and optimizations to better suit desktops. Zen is a 100% community
+oriented project so, as a result, everybody can contribute to the
+project.
+EOF
diff --git a/kernel/linux-2.6-zen/POST_INSTALL b/kernel/linux-2.6-zen/POST_INSTALL
new file mode 100644
index 0000000..dd6cddc
--- /dev/null
+++ b/kernel/linux-2.6-zen/POST_INSTALL
@@ -0,0 +1,8 @@
+update_bootloader $VERSION-`arch` $VERSION-`arch`
+
+#  Reinstall packages that add their own kernel modules
+
+lin -c kernel-reqs
+
+# create /sys
+mkdir -p /sys
diff --git a/kernel/linux-2.6-zen/PRE_BUILD b/kernel/linux-2.6-zen/PRE_BUILD
new file mode 100644
index 0000000..3abe7fe
--- /dev/null
+++ b/kernel/linux-2.6-zen/PRE_BUILD
@@ -0,0 +1,32 @@
+# Bail if we're not running a core with kernel functions
+
+if [ ! -e $FUNCTIONS/kernel.lunar ] ; then
+  message "${PROBLEM_COLOR}Bailing out, ${DEFAULT_COLOR}Lunar (or theedge) code version too old"
+  message "${PROBLEM_COLOR}Update core ${MODULE_COLOR}(lin lunar or lin theedge)${DEFAULT_COLOR} to install this kernel"
+  exit 1
+fi
+
+mk_source_dir $SOURCE_DIRECTORY
+rm -f /usr/src/linux
+ln -sf $SOURCE_DIRECTORY /usr/src/linux
+cd $SOURCE_DIRECTORY
+
+# Check wether we're running an up-to-date tar
+if [ `installed_version tar | cut -d. -f2` -ge 15 ]; then
+  tar xf $SOURCE_CACHE/$SOURCE --no-same-owner \
+  --no-same-permissions --strip-components=1
+else
+  message "${PROBLEM_COLOR}Error:${DEFAULT_COLOR} Please update your tar module"
+  exit 1
+fi
+
+# Applying ZEN patch !
+lzma -df $SOURCE_CACHE/$SOURCE2
+patch_it $VERSION.patch 1
+
+if  [ -f $CONFIG_CACHE/.config.2.6.stable ]; then
+    cp $CONFIG_CACHE/.config.2.6.stable $SOURCE_DIRECTORY/.config;
+elif [ -f $CONFIG_CACHE/.config.beta ]; then
+    cp $CONFIG_CACHE/.config.beta $SOURCE_DIRECTORY/.config;
+fi
+
diff --git a/zbeta/linux-2.6-zen/BUILD b/zbeta/linux-2.6-zen/BUILD
deleted file mode 100644
index a20e8d3..0000000
--- a/zbeta/linux-2.6-zen/BUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-
-  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
-
-) && (
-
-  # Needed for x86_64
-  MYARCH="`arch | grep -qw i.86 && echo i386 || arch`"
-
-  echo | make oldconfig
-  LD_PRELOAD= cp .config $CONFIG_CACHE/.config.2.6.stable
-  rm -f arch/${MYARCH}/boot/bzImage
-
-  make ${MAKES:+-j$MAKES} bzImage  &&
-  make ${MAKES:+-j$MAKES} modules  &&
-  backup_mods_krnl $VERSION        &&
-  prepare_install                  &&
-  make modules_install             &&
-  cp arch/${MYARCH}/boot/bzImage /boot/$VERSION-`arch`  &&
-  cp System.map /boot/System.map-$VERSION-`arch`
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/linux-2.6-zen/CONFIGURE b/zbeta/linux-2.6-zen/CONFIGURE
deleted file mode 100644
index 5dbd7cc..0000000
--- a/zbeta/linux-2.6-zen/CONFIGURE
+++ /dev/null
@@ -1,11 +0,0 @@
-mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
-
-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
-
-unset_module_config CONFIG_KERNEL
-mquery CONFIG_KERNEL "Configure linux kernel?" n
-
diff --git a/zbeta/linux-2.6-zen/DEPENDS b/zbeta/linux-2.6-zen/DEPENDS
deleted file mode 100644
index 8ef0357..0000000
--- a/zbeta/linux-2.6-zen/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends  autoconf
-depends  module-init-tools
-depends  xz
diff --git a/zbeta/linux-2.6-zen/DETAILS b/zbeta/linux-2.6-zen/DETAILS
deleted file mode 100644
index 36169be..0000000
--- a/zbeta/linux-2.6-zen/DETAILS
+++ /dev/null
@@ -1,30 +0,0 @@
-          MODULE=linux-2.6-zen
-  KERNEL_VERSION=2.6.32
-     ZEN_VERSION=2
-         VERSION=$KERNEL_VERSION-zen$ZEN_VERSION
-          SOURCE=linux-$KERNEL_VERSION.tar.bz2
-         SOURCE2=$VERSION.patch.lzma
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/linux-$VERSION
-   SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
-   SOURCE_URL[1]=http://kernel.org/pub/linux/kernel/v2.6/
-     SOURCE2_URL=http://downloads.zen-kernel.org/$KERNEL_VERSION/
-      SOURCE_VFY=sha1:410b4fc818023bfef60064e973ff0ab46d3bfb19
-     SOURCE2_VFY=sha1:767fe59a3cb8611a00c681eb01b8e49df9ca311f
-        WEB_SITE=http://www.zen-kernel.org
-         ENTERED=20091218
-         UPDATED=20091218
-           SHORT="2.6 kernel with latest stable Zen patches."
-     KEEP_SOURCE=on
-           TMPFS=off
-
-cat << EOF
-The Zen Kernel is a the result of a collaborative effort of kernel
-hackers to provide the best Linux kernel possible for every day
-systems. We include code that is not included in the mainline kernel
-in an attempt to create an all-around better kernel for desktops
-(although it can be compiled otherwise). This is done by including
-new features, supporting latest hardware, and including various code
-and optimizations to better suit desktops. Zen is a 100% community
-oriented project so, as a result, everybody can contribute to the
-project.
-EOF
diff --git a/zbeta/linux-2.6-zen/POST_INSTALL b/zbeta/linux-2.6-zen/POST_INSTALL
deleted file mode 100644
index dd6cddc..0000000
--- a/zbeta/linux-2.6-zen/POST_INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-update_bootloader $VERSION-`arch` $VERSION-`arch`
-
-#  Reinstall packages that add their own kernel modules
-
-lin -c kernel-reqs
-
-# create /sys
-mkdir -p /sys
diff --git a/zbeta/linux-2.6-zen/PRE_BUILD b/zbeta/linux-2.6-zen/PRE_BUILD
deleted file mode 100644
index 3abe7fe..0000000
--- a/zbeta/linux-2.6-zen/PRE_BUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Bail if we're not running a core with kernel functions
-
-if [ ! -e $FUNCTIONS/kernel.lunar ] ; then
-  message "${PROBLEM_COLOR}Bailing out, ${DEFAULT_COLOR}Lunar (or theedge) code version too old"
-  message "${PROBLEM_COLOR}Update core ${MODULE_COLOR}(lin lunar or lin theedge)${DEFAULT_COLOR} to install this kernel"
-  exit 1
-fi
-
-mk_source_dir $SOURCE_DIRECTORY
-rm -f /usr/src/linux
-ln -sf $SOURCE_DIRECTORY /usr/src/linux
-cd $SOURCE_DIRECTORY
-
-# Check wether we're running an up-to-date tar
-if [ `installed_version tar | cut -d. -f2` -ge 15 ]; then
-  tar xf $SOURCE_CACHE/$SOURCE --no-same-owner \
-  --no-same-permissions --strip-components=1
-else
-  message "${PROBLEM_COLOR}Error:${DEFAULT_COLOR} Please update your tar module"
-  exit 1
-fi
-
-# Applying ZEN patch !
-lzma -df $SOURCE_CACHE/$SOURCE2
-patch_it $VERSION.patch 1
-
-if  [ -f $CONFIG_CACHE/.config.2.6.stable ]; then
-    cp $CONFIG_CACHE/.config.2.6.stable $SOURCE_DIRECTORY/.config;
-elif [ -f $CONFIG_CACHE/.config.beta ]; then
-    cp $CONFIG_CACHE/.config.beta $SOURCE_DIRECTORY/.config;
-fi
-


More information about the Lunar-commits mailing list