Merge openembedded@openembedded.bkbits.net:packages

into odin.(none):/home/kergoth/code/packages

2004/06/24 22:44:55+01:00 nexus.co.uk!pb
Merge bk://openembedded@openembedded.bkbits.net/packages
into dixie.nexus.co.uk:/home/pb/oe/oe-packages

2004/06/24 22:44:29+01:00 nexus.co.uk!pb
add new .oe for simpad kernel with 64+0 RAM config

BKrev: 40db4b58qzQJpXR2iuzlJjlJ9xTGhg

diff --git a/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.oe b/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
index 75bf891..9b4f3dc 100644 (file)
--- a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
+++ b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
@@ -7,6 +7,8 @@ PXAV = "${@oe.data.getVar('PV',d,True).split('-')[2]}"
 JPMV = "${@oe.data.getVar('PV',d,True).split('-')[3]}"
 PR = "r3"
 
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/opensimpad-${PV}"
+
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            file://${KV}-${VRSV}.patch;patch=1 \
            file://${KV}-${VRSV}-${PXAV}.patch;patch=1 \
@@ -27,17 +29,16 @@ inherit kernel
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-#FIXME: Use configuration system
-export MEM = "32"
-export RD = "32"
-export CMDLINE = "mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "
+SIMPAD_MEM = "32"
+SIMPAD_RD = "32"
+CMDLINE = "mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "
 EXTRA_OEMAKE = ""
 
 do_configure() {
         install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
 
-        mem=${MEM}
-        rd=${RD}
+        mem=${SIMPAD_MEM}
+        rd=${SIMPAD_RD}
         mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
         rdsize=`echo "$rd * 1024" | bc`
         total=`expr $mem + $rd`
@@ -51,7 +52,7 @@ do_configure() {
                 echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
                 echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
         fi
-       echo "CONFIG_CMDLINE=\"$CMDLINE mem=${mem}M\"" >> ${S}/.config
+       echo "CONFIG_CMDLINE=\"${CMDLINE} mem=${mem}M\"" >> ${S}/.config
         oe_runmake oldconfig
 }