diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-12 10:21:01 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-12 10:21:01 +0000 |
| commit | 2b8d6d7c246759913efb718d5417910f1336ed02 (patch) | |
| tree | 3f973d117dfa3747a5531d4eb1bd06cb73a66c88 /conf/machine | |
| parent | f9f38d4d7803a93cfa5f9b40007cd887c7bd8ac0 (diff) | |
ixp4xx: correct IPKG_ARCHS to include ${MACHINE}[bl] in ixp4xx.conf
- the kernel packages now use ${MACHINE}[bl] according to the system
byte sex, therefore this must be included in the IPKG_ARCH list or
the image build will fail.
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/include/ixp4xx.conf | 3 | ||||
| -rw-r--r-- | conf/machine/nas100d.conf | 2 | ||||
| -rw-r--r-- | conf/machine/nslu2.conf | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 5005f581ff..3c5077056e 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -134,7 +134,8 @@ IPKG_ARCHS = "${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ (bb.data.getVar('THUMB_ARCHITECTURES', d, 1), \ bb.data.getVar('ARM_ARCHITECTURES', d, 1), \ bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'thumb', \ - bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} ${MACHINE_ARCH}" + bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \ + ${MACHINE_ARCH} ${MACHINE}${BYTE_SEX_CHAR}" #------------------------------------------------------------------------------- # Package versions diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf index 02a59d6045..4798c23c28 100644 --- a/conf/machine/nas100d.conf +++ b/conf/machine/nas100d.conf @@ -9,5 +9,5 @@ SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc" -IXP4XX_SUFFIX = "nas100d${BYTE_SEX_CHAR}" +IXP4XX_SUFFIX = "${MACHINE}${BYTE_SEX_CHAR}" IXP4XX_MACHID = "865" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index f5ee008204..a20e8b73a9 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -9,6 +9,6 @@ SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" CMDLINE_ROOT = "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc" -IXP4XX_SUFFIX = "nslu2${BYTE_SEX_CHAR}" +IXP4XX_SUFFIX = "${MACHINE}${BYTE_SEX_CHAR}" IXP4XX_MACHID = "597" IXP4XX_LEFIXUP = "1" |