diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/apex/apex_1.4.7.bb (renamed from packages/apex/apex_1.4.5.bb) | 17 | ||||
| -rw-r--r-- | packages/apex/nslu2/defconfig | 13 | ||||
| -rw-r--r-- | packages/images/slugos-image.bb | 9 | ||||
| -rw-r--r-- | packages/ixp4xx/ixp4xx-npe_2.3.bb | 7 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.19-rc5.bb (renamed from packages/linux/ixp4xx-kernel_2.6.19-rc3.bb) | 2 | ||||
| -rw-r--r-- | packages/slugimage/slugimage-native.bb | 2 | ||||
| -rw-r--r-- | packages/slugimage/slugimage.bb | 14 | ||||
| -rw-r--r-- | packages/upslug/upslug2.inc | 10 |
8 files changed, 44 insertions, 30 deletions
diff --git a/packages/apex/apex_1.4.5.bb b/packages/apex/apex_1.4.7.bb index 35d772aa0b..0a7d5520fc 100644 --- a/packages/apex/apex_1.4.5.bb +++ b/packages/apex/apex_1.4.7.bb @@ -23,18 +23,19 @@ CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linu # defconfig to .config do_configure() { rm -f ${S}/.config - echo "CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' if test '${ARCH_BYTE_SEX}' = be then - echo 'CONFIG_USER_BIGENDIAN=y' >>'${S}/.config' - echo 'CONFIG_BIGENDIAN=y' >>'${S}/.config' + sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ + -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config else - echo 'CONFIG_USER_LITTLEENDIAN=y' >>'${S}/.config' - echo 'CONFIG_LITTLEENDIAN=y' >>'${S}/.config' + sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config fi - sed -e '/CONFIG_USER_BIGENDIAN/d' -e '/CONFIG_USER_LITTLEENDIAN/d' \ - -e '/CONFIG_ENV_DEFAULT_CMDLINE/d' \ - ${S}/src/mach-ixp42x/debian-nslu2-arm_config >>${S}/.config oe_runmake oldconfig } diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig index 113c69a68e..2d2784457a 100644 --- a/packages/apex/nslu2/defconfig +++ b/packages/apex/nslu2/defconfig @@ -48,7 +48,7 @@ CONFIG_MACH_NSLU2=y # CONFIG_MACH_AVILA2347 is not set # CONFIG_USER_DEFAULTENDIAN is not set # CONFIG_USER_BIGENDIAN is not set -CONFIG_USER_LITTLEENDIAN=y +# CONFIG_USER_LITTLEENDIAN is not set # # Platform Setup @@ -89,8 +89,7 @@ CONFIG_CMD_XRECEIVE=y # # CONFIG_DRIVER_FAT is not set # CONFIG_DRIVER_EXT2 is not set -CONFIG_DRIVER_JFFS2=y -CONFIG_DRIVER_JFFS2_BLOCKDEVICE="nor:0x180000+0x660000" +# CONFIG_DRIVER_JFFS2 is not set CONFIG_DRIVER_FIS=y CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k" CONFIG_DRIVER_NOR_CFI=y @@ -102,21 +101,25 @@ CONFIG_USES_PATHNAME_PARSER=y # Environment # CONFIG_ENV=y +# CONFIG_NO_BOOTSTRAP is not set CONFIG_NOR_BOOT=y # CONFIG_NAND_BOOT is not set +# CONFIG_COMPANION_EVT1_BOOT is not set +# CONFIG_COMPANION_EVT2_BOOT is not set CONFIG_AUTOBOOT=y CONFIG_AUTOBOOT_DELAY=10 CONFIG_ENV_MUTABLE=y CONFIG_ENV_LINK=y CONFIG_ENV_REGION="nor:0x7fc000+15k" +CONFIG_ENV_CHECK_LEN=1024 CONFIG_ENV_STARTUP_KERNEL_COPY=y CONFIG_ENV_REGION_KERNEL="fis://kernel" -CONFIG_ENV_REGION_KERNEL_SWAP=y +# CONFIG_ENV_REGION_KERNEL_SWAP is not set # CONFIG_ENV_STARTUP_RAMDISK_COPY is not set CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y CONFIG_ENV_DEFAULT_CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug" # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set CONFIG_USES_NOR_BOOTFLASH=y -CONFIG_LITTLEENDIAN=y +# CONFIG_LITTLEENDIAN is not set CONFIG_CLEAR_STACKS=y CONFIG_ALIASES=y diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 90a5cefcbe..e59fab165e 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -115,7 +115,7 @@ python () { # it is a bad idea to produce flash images without a valid RedBoot - that allows # an innocent user upgrade attempt to instantly brick the NSLU2. PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}" -PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}" +PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}" NSLU2_SLUGIMAGE_ARGS ?= "" @@ -127,13 +127,16 @@ nslu2_pack_image() { ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ ${DEPLOY_DIR_IMAGE}/slug/ + install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/ install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${ARCH_BYTE_SEX} \ ${DEPLOY_DIR_IMAGE}/slug/vmlinuz install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 + install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/ cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t \ - Trailer -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \ + slugimage -p -b RedBoot -s SysConf -L apex.bin -k vmlinuz \ + -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \ ${NSLU2_SLUGIMAGE_ARGS} rm -rf ${DEPLOY_DIR_IMAGE}/slug fi diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb index 039308ac47..dcff23b645 100644 --- a/packages/ixp4xx/ixp4xx-npe_2.3.bb +++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "NPE firmware for the IXP4xx line of devices" LICENSE = "Intel Public Licence" -PR = "r6" +PR = "r8" DEPENDS = "ixp4xx-npe-native" SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip" @@ -26,3 +26,8 @@ do_install() { install ${S}/NPE-B ${D}/${base_libdir}/firmware/ } +do_populate_staging() { + install -d ${STAGING_FIRMWARE_DIR} + install ${S}/NPE-B ${STAGING_FIRMWARE_DIR}/ +} + diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc3.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb index 3b1453c38b..77169461aa 100644 --- a/packages/linux/ixp4xx-kernel_2.6.19-rc3.bb +++ b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "534" +IXP4XX_KERNEL_SVN_REV = "574" # # The directory containing the patches to be applied is # specified below diff --git a/packages/slugimage/slugimage-native.bb b/packages/slugimage/slugimage-native.bb index 81328ae414..8b60ff1b59 100644 --- a/packages/slugimage/slugimage-native.bb +++ b/packages/slugimage/slugimage-native.bb @@ -9,5 +9,5 @@ inherit native FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugimage-${PV}', '${FILE_DIRNAME}/slugimage', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" do_stage () { - install -m 0755 slugimage/slugimage ${STAGING_BINDIR}/ + install -m 0755 slugimage ${STAGING_BINDIR}/ } diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb index 6b672cdc23..ab61c71927 100644 --- a/packages/slugimage/slugimage.bb +++ b/packages/slugimage/slugimage.bb @@ -3,14 +3,22 @@ SECTION = "console/utils" LICENSE = "BSD" DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \ flash images for the Linksys NSLU2 device. It also has jffs2 support" -PR = "r4" +PR = "r5" RDEPENDS = "perl" -SRC_URI = "cvs://anonymous:@nslu.cvs.sourceforge.net/cvsroot/nslu;module=slugimage;tag=SLUGIMAGE_3_2" +SLUGIMAGE_SVN_REV ?= 77 +SLUGIMAGE_SVN_REPO ?= http://svn.nslu2-linux.org/svnroot/slugimage/trunk + +addtask svnfetch before do_configure after do_patch + +do_svnfetch() { + svn co ${SLUGIMAGE_SVN_REPO} --revision ${SLUGIMAGE_SVN_REV} ${WORKDIR} +} + S = "${WORKDIR}" do_install () { install -d ${D}${bindir} - install -m 0755 slugimage/slugimage ${D}${bindir}/ + install -m 0755 slugimage ${D}${bindir}/ } diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc index 0a91bc3fd1..9bee027034 100644 --- a/packages/upslug/upslug2.inc +++ b/packages/upslug/upslug2.inc @@ -1,11 +1,12 @@ # This package builds the 'upslug2' binary upload/flash tool # for the NSLU2. It is not useful for anything else. -PR = "r0" +PR = "r1" DESCRIPTION = "NSLU2 binary upload tool (version 2)" HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2" SECTION = "console/network" PRIORITY = "optional" LICENSE = "MIT" +COMPATIBLE_MACHINE = "nslu2" # On Linux libpcap does not work. Using libpcap is sub-optimal - it # is intended for packet capture not management of a new protocol @@ -28,10 +29,3 @@ S = "${WORKDIR}/upslug2-${PV}" PACKAGES = "${PN}" EXTRA_OECONF += "${LIBPCAP_OECONF}" - -python () { - # Don't build upslug2 unless we're targeting an nslu2 - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'nslu2': - raise bb.parse.SkipPackage("upslug2 only builds for the Linksys NSLU2") -} |