Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/02 14:30:21+00:00 nexus.co.uk!pb
also correct name of defconfig in handhelds-pxa SRC_URI

2005/01/02 13:46:56+00:00 nexus.co.uk!pb
correct name of defconfig file in handhelds-sa SRC_URI

BKrev: 41d807c9txpFuF8WNHTRrhTlI51jJg

diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
index e824e73..e95f809 100644 (file)
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -8,7 +8,7 @@ KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-          file://defconfig-ipaqpxa \
+          file://defconfig-${PACKAGE_ARCH} \
           file://ipaq-hal.init \
           file://linux-2.4-no-short-loads.patch;patch=1 \
           file://linux-2.4-cpufreq.patch;patch=1 \

diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
index 74e6e59..d7c2d4e 100644 (file)
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -9,7 +9,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://defconfig-ipaqsa \
+           file://defconfig-${PACKAGE_ARCH} \
           file://ipaq-hal.init"
 
 S = "${WORKDIR}/kernel"