extraversion additions for kernel compile, bumps in amd64 for 2004.0 profile, add...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@200 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/examples/amd64/amd64-stage1-20040201.spec b/examples/amd64/amd64-stage1-20040201.spec
new file mode 100644 (file)
index 0000000..40511dd
--- /dev/null
+++ b/examples/amd64/amd64-stage1-20040201.spec
@@ -0,0 +1,7 @@
+subarch: amd64
+version_stamp: 20040201
+target: stage1
+rel_type: default
+rel_version: 2004.0
+snapshot: 20040201
+source_subpath: default-amd64-2004.0/stage2-amd64-20040201

diff --git a/examples/amd64/amd64-stage2-20040201.spec b/examples/amd64/amd64-stage2-20040201.spec
new file mode 100644 (file)
index 0000000..430ae06
--- /dev/null
+++ b/examples/amd64/amd64-stage2-20040201.spec
@@ -0,0 +1,7 @@
+subarch: amd64
+version_stamp: 20040201
+target: stage2
+rel_type: default
+rel_version: 2004.0
+snapshot: 20040201
+source_subpath: default-amd64-2004.0/stage1-amd64-20040201

diff --git a/examples/amd64/amd64-stage3-20040201.spec b/examples/amd64/amd64-stage3-20040201.spec
new file mode 100644 (file)
index 0000000..7937132
--- /dev/null
+++ b/examples/amd64/amd64-stage3-20040201.spec
@@ -0,0 +1,7 @@
+subarch: amd64
+version_stamp: 20040201
+target: stage3
+rel_type: default
+rel_version: 2004.0
+snapshot: 20040201
+source_subpath: default-amd64-2004.0/stage2-amd64-20040201

diff --git a/examples/livecd/amd64/amd64-livecd-stage1-20040124.spec b/examples/livecd/amd64/amd64-livecd-stage1-20040201.spec
similarity index 80%
rename from examples/livecd/amd64/amd64-livecd-stage1-20040124.spec
rename to examples/livecd/amd64/amd64-livecd-stage1-20040201.spec
index 039326cb64ecf2b4eb52dd4638caacdbdd69c6b1..ff2ad4ddd4d4587e8fc3e59e198546e2c2d433b9 100644 (file)
--- a/examples/livecd/amd64/amd64-livecd-stage1-20040124.spec
+++ b/examples/livecd/amd64/amd64-livecd-stage1-20040201.spec
@@ -1,14 +1,15 @@
 subarch: amd64
-version_stamp: 20040124
+version_stamp: 20040201
 target: livecd-stage1
 rel_type: default
-rel_version: 1.4
-snapshot: 20040124
-source_subpath: default-amd64-1.4/stage3-amd64-20040124
+rel_version: 2004.0
+snapshot: 20040201
+source_subpath: default-amd64-2004.0/stage3-amd64-20040201
 livecd/use:
        -X
        -gtk
        -svga
+       fbcon
        livecd
 livecd/packages:
        >=sys-apps/baselayout-1.8.6.12-r4

diff --git a/examples/livecd/amd64/amd64-livecd-stage2-20040124.spec b/examples/livecd/amd64/amd64-livecd-stage2-20040201.spec
similarity index 75%
rename from examples/livecd/amd64/amd64-livecd-stage2-20040124.spec
rename to examples/livecd/amd64/amd64-livecd-stage2-20040201.spec
index 5f87771a33df505a3438f3ed38ee2763de997deb..27d3a7f19ce12c9d6b8165e0a3d37aa438edc01c 100644 (file)
--- a/examples/livecd/amd64/amd64-livecd-stage2-20040124.spec
+++ b/examples/livecd/amd64/amd64-livecd-stage2-20040201.spec
@@ -1,17 +1,22 @@
 subarch: amd64
-version_stamp: 20040124
+version_stamp: 20040201
 target: livecd-stage2
 rel_type: default
-rel_version: 1.4
-snapshot: 20040124
-source_subpath: default-amd64-1.4/livecd-stage1-amd64-20040124
-livecd/cdfstype: normal
+rel_version: 2004.0
+snapshot: 20040201
+source_subpath: default-amd64-2004.0/livecd-stage1-amd64-20040201
+livecd/cdfstype: zisofs
 livecd/archscript: examples/livecd/runscript/x86-archscript.sh
 livecd/runscript: examples/livecd/runscript/default-runscript.sh
 livecd/cdtar: examples/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2
-boot/kernel: gentoo
+boot/kernel: gentoo smp
 boot/kernel/gentoo/sources: =sys-kernel/gentoo-dev-sources-2.6.2_rc1
 boot/kernel/gentoo/config: /usr/share/genkernel/x86_64/kernel-config-2.6
+boot/kernel/gentoo/extraversion: up
+boot/kernel/smp/sources: =sys-kernel/gentoo-dev-sources-2.6.2_rc1
+boot/kernel/smp/config: /usr/share/genkernel/x86_64/kernel-config-2.6-smp
+boot/kernel/smp/extraversion: smp
+
 livecd/unmerge:
        autoconf automake bin86 binutils libtool m4 bison ld.so make perl patch linux-headers man-pages
        sash bison flex gettext texinfo ccache addpatches man groff lib-compat gcc python miscfiles ucl

diff --git a/examples/livecd/runscript/default-runscript.sh b/examples/livecd/runscript/default-runscript.sh
index 0ac79995a31c6101563497bd5d48aece6b81f3f9..4c2669b572beaff935d92c25d377937657101545 100644 (file)
--- a/examples/livecd/runscript/default-runscript.sh
+++ b/examples/livecd/runscript/default-runscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/examples/livecd/runscript/Attic/default-runscript.sh,v 1.11 2004/01/26 18:15:50 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/examples/livecd/runscript/Attic/default-runscript.sh,v 1.12 2004/02/02 04:00:40 brad_mssw Exp $
 
 #return codes to be used by archscript
 
@@ -82,6 +82,8 @@ case $1 in
                        shift
                        clst_ksource="$1"
                        shift
+                       clst_kextversion="$1"
+                       shift
                        $clst_CHROOT $clst_chroot_path /bin/bash << EOF
                                # SCRIPT TO BUILD EACH KERNEL. THIS GETS EXECUTED IN CHROOT
                                env-update
@@ -98,7 +100,9 @@ case $1 in
                                else
                                        emerge --noreplace $clst_ksource || exit 1
                                fi
-
+                               # Append Extraversion
+                               [ ! -e /usr/src/linux ] && exit 1 
+                               sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextversion}:" /usr/src/linux/Makefile
                                genkernel ${genkernel_args} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/$clst_kname.config --minkernpackage=/tmp/binaries/$clst_kname.tar.bz2 all || exit 1
                                emerge -C genkernel $clst_ksource
                                # END OF SCRIPT TO BUILD EACH KERNEL
@@ -122,6 +126,7 @@ EOF
                        rc-update del consolefont
                        rc-update add metalog default
                        rc-update add modules default
+                       [ -e /etc/init.d/bootsplash ] && rc-update add bootsplash default
                        /sbin/depscan.sh
                        rm -rf /etc/localtime
                        cp /usr/share/zoneinfo/GMT /etc/localtime

diff --git a/examples/livecd/x86/x86-livecd-stage1-20040120.spec b/examples/livecd/x86/x86-livecd-stage1-20040120.spec
index 16dbf862b7a0889875991f5b4e787ec3231f7905..c2bb6aa84a8c0a832be2f70ab4d6627d002f522a 100644 (file)
--- a/examples/livecd/x86/x86-livecd-stage1-20040120.spec
+++ b/examples/livecd/x86/x86-livecd-stage1-20040120.spec
@@ -9,6 +9,7 @@ livecd/use:
        -X
        -gtk
        -svga
+       fbcon
        livecd
 livecd/packages:
        >=sys-apps/baselayout-1.8.6.12-r4

diff --git a/examples/livecd/x86/x86-livecd-stage2-20040120.spec b/examples/livecd/x86/x86-livecd-stage2-20040120.spec
index ad23ebad1496a543ec33aa38f99371cb98b488fb..a3995f8542e72930e883290491af8d706792afae 100644 (file)
--- a/examples/livecd/x86/x86-livecd-stage2-20040120.spec
+++ b/examples/livecd/x86/x86-livecd-stage2-20040120.spec
@@ -12,6 +12,7 @@ livecd/cdtar: examples/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: =sys-kernel/gentoo-dev-sources-2.6.1-r1
 boot/kernel/gentoo/config: examples/livecd/x86/config-2.6.1-x86
+boot/kernel/gentoo/extraversion: livecd
 livecd/unmerge:
        autoconf automake bin86 binutils libtool m4 bison ld.so make perl patch linux-headers man-pages
        sash bison flex gettext texinfo ccache addpatches man groff lib-compat gcc python miscfiles ucl

diff --git a/modules/targets.py b/modules/targets.py
index 2164292354cd5c60589d0a612500b522f8542318..38b5771c9aefe9aee92d836633505f25c13112e6 100644 (file)
--- a/modules/targets.py
+++ b/modules/targets.py
@@ -424,6 +424,7 @@ class livecd_stage2_target(generic_stage_target):
                for x in loopy:
                        self.required_values.append("boot/kernel/"+x+"/sources")
                        self.required_values.append("boot/kernel/"+x+"/config")
+                       self.required_values.append("boot/kernel/"+x+"/extraversion")
                self.valid_values=self.required_values[:]
                self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm","livecd/unmerge"])
                generic_stage_target.__init__(self,spec,addlargs)
@@ -503,6 +504,14 @@ class livecd_stage2_target(generic_stage_target):
                        if not os.path.exists(self.settings["boot/kernel/"+x+"/config"]):
                                self.unbind()
                                raise CatalystError, "Can't find kernel config: "+self.settings["boot/kernel/"+x+"/config"]
+
+                       # We must support multiple configs for the same kernel, so we must manually edit the
+                       # EXTRAVERSION on the kernel to allow them to coexist.  The extraversion field gets appended
+                       # to the current EXTRAVERSION in the kernel Makefile.  Examples of this usage are UP vs SMP kernels,
+                       # and on PPC64 we need a seperate pSeries, iSeries, and PPC970 (G5) kernels, all compiled off the
+                       # same source, without having to release a seperate livecd for each (since other than the kernel,
+                       # they are all binary compatible)
+                       args.append(self.settings["boot/kernel/"+x+"/extraversion"])
                        retval=os.system("cp "+self.settings["boot/kernel/"+x+"/config"]+" "+self.settings["chroot_path"]+"/var/tmp/"+x+".config")
                        if retval!=0:
                                self.unbind()