diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-05-27 15:59:49 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-27 15:59:49 +0000 |
| commit | 5f279acef1655e07bac92c4ea0aad6bfe39c7365 (patch) | |
| tree | bcf80175637e680a070527c5d2133321e952b534 /linux | |
| parent | 7404e0aad4b9a07aca1bcfc480aa9594b95e9545 (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into odin.(none):/home/kergoth/code/packages
2004/05/27 15:51:04+02:00 uni-frankfurt.de!mickeyl
fix opie-packagemanager packaging
2004/05/27 15:10:47+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages
2004/05/27 15:08:36+02:00 hrw.one.pl!hrw
openzaurus-sa: Allow to define memory/disk split size in local.conf
2004/05/27 15:01:10+02:00 uni-frankfurt.de!mickeyl
add python-quicklauncher to task-python-everything
2004/05/27 14:59:24+02:00 uni-frankfurt.de!mickeyl
add python-quicklauncher, a quick launcher for pyqt applications
2004/05/27 14:28:33+02:00 uni-frankfurt.de!mickeyl
add opie-tonleiter, musicians program
2004/05/27 14:22:51+02:00 uni-frankfurt.de!mickeyl
upgrade python to Version 2.3.4
Disable the autohell patch since it doesn't apply and I don't have enough 31337 haxor skills
to check whether it is still necessary and if so how to upgrade it.
2004/05/27 14:19:52+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages
2004/05/27 14:17:25+02:00 mn-logistik.de!schurig
test if bk push works again
2004/05/27 14:05:42+02:00 uni-frankfurt.de!mickeyl
really disable the hardcoded (ugh) CONFIG_PCMCIA_PROBE this time
2004/05/27 12:34:52+02:00 uni-frankfurt.de!mickeyl
fix lockstat SkipPackage error, it's defined in oe.parse
BKrev: 40b6107519yzo-6hB5Hw7ZLE4uSQ3w
Diffstat (limited to 'linux')
3 files changed, 3 insertions, 6 deletions
diff --git a/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe b/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe index 57fcc8dbd8..175384e9b3 100644 --- a/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe +++ b/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe @@ -2,9 +2,7 @@ LICENSE = "GPL" KV = "2.4.21" RMKV = "2" PXAV = "1" -#PV = "${KV}-rmk${RMKV}-pxa${PXAV}" DESCRIPTION = "Linux kernel for MNCI device" -#FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/ramses-${KV}-rmk${RMKV}-pxa${PXAV}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \ diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/disable-pcmcia-probe.patch b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/disable-pcmcia-probe.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/disable-pcmcia-probe.patch diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe index 7ca76ab7fe..8a9c2714e7 100644 --- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe +++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe @@ -19,6 +19,7 @@ SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${ file://logo.patch;patch=1 \ file://initsh.patch;patch=1 \ file://mkdep.patch;patch=1 \ + file://disable-pcmcia-probe.patch;patch=1 \ file://defconfig-${MACHINE}" # apply this when we have a patch that allows building with gcc 3.x: @@ -43,15 +44,13 @@ EXTRA_OEMAKE = "" # # FIXME: Use configuration system # -export MEM = "32" -export RD = "32" +export mem = ${@oe.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"} +export rd = ${@oe.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"} export CMDLINE = "console=ttySA root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphand_inodes=delete" do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." - mem=${MEM} - rd=${RD} mempos=`echo "obase=16; $mem * 1024 * 1024" | bc` rdsize=`echo "$rd * 1024" | bc` total=`expr $mem + $rd` |