diff options
| -rw-r--r-- | classes/nslu2-jffs2-image.bbclass (renamed from classes/nslu2_flashimg.bbclass) | 0 | ||||
| -rw-r--r-- | classes/nslu2-ramdisk-image.bbclass | 18 | ||||
| -rw-r--r-- | conf/distro/openslug.conf | 2 | ||||
| -rw-r--r-- | conf/distro/ucslugc.conf | 2 | ||||
| -rw-r--r-- | conf/distro/unslung.conf | 10 | ||||
| -rw-r--r-- | conf/machine/nslu2.conf | 5 | ||||
| -rw-r--r-- | files/device_table-unslung.txt | 10 |
7 files changed, 33 insertions, 14 deletions
diff --git a/classes/nslu2_flashimg.bbclass b/classes/nslu2-jffs2-image.bbclass index 56ad0f0659..56ad0f0659 100644 --- a/classes/nslu2_flashimg.bbclass +++ b/classes/nslu2-jffs2-image.bbclass diff --git a/classes/nslu2-ramdisk-image.bbclass b/classes/nslu2-ramdisk-image.bbclass new file mode 100644 index 0000000000..0b545854fd --- /dev/null +++ b/classes/nslu2-ramdisk-image.bbclass @@ -0,0 +1,18 @@ +NSLU2_SLUGIMAGE_ARGS ?= "" + +nslu2_pack_image () { + install -d ${DEPLOY_DIR_IMAGE}/slug + install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ + ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ + ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + ${DEPLOY_DIR_IMAGE}/slug/ + install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IMAGE_BASENAME} ${DEPLOY_DIR_IMAGE}/slug/vmlinuz + install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug/ramdisk.ext2.gz + cd ${DEPLOY_DIR_IMAGE}/slug + slugimage -p -b RedBoot -s SysConf -r Ramdisk:ramdisk.ext2.gz -t Trailer \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ramdisk.img ${NSLU2_SLUGIMAGE_ARGS} + rm -rf ${DEPLOY_DIR_IMAGE}/slug +} + +EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware' +IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 78e3cc0378..b5a580d97b 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -15,7 +15,7 @@ TARGET_OS = "linux" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" -INHERIT += " package_ipk debian nslu2_flashimg" +INHERIT += " package_ipk debian nslu2-jffs2-image" # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see openslug-packages.conf in this diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 0376eadd00..39251c5375 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -19,7 +19,7 @@ ARM_INTERWORK = ":thumb-interwork" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" -INHERIT += " package_ipk debian nslu2_flashimg" +INHERIT += " package_ipk debian nslu2-jffs2-image" # The OVERRIDES are modified here so that 'openslug' overrides are picked up if # present (ucslugc overrides take precedence). diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 75c251f220..06331707fc 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -7,7 +7,7 @@ FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native" FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe" DISTRO_NAME = "Unslung" -DISTRO_VERSION = "5.5-beta" +DISTRO_VERSION = "5.6-alpha" DISTRO_TYPE = "beta" # pull in the frozen list of bbfiles @@ -19,7 +19,7 @@ TARGET_OS = "linux" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" -INHERIT += " package_ipk nslu2_flashimg" +INHERIT += " package_ipk nslu2-jffs2-image" IMAGE_FSTYPE = "jffs2" UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}" @@ -43,3 +43,9 @@ PREFERRED_VERSION_glibc ?= "2.2.5" PREFERRED_VERSION_glibc-initial ?= "2.2.5" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" + +PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r29" +PREFERRED_VERSION_unslung-rootfs ?= "2.3r29" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29" +PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r29" +PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r29" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 3a9a9d9730..1616299ae9 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -120,11 +120,6 @@ NSLU2_PACKAGE_ARCH = "${@['thumbv5tb', 'armv5teb'][bb.data.getVar('ARM_INSTRUCTI #------------------------------------------------------------------------------- # Miscellany #------------------------------------------------------------------------------- -# JBowler(20050811): I don't think any of the following are required (now). -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -IMAGE_ROOTFS_SIZE_ext2 = "10240" -IMAGE_ROOTFS_SIZE_ext2.gz = "10240" - SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" diff --git a/files/device_table-unslung.txt b/files/device_table-unslung.txt index 1639acadaf..7fdd4df68b 100644 --- a/files/device_table-unslung.txt +++ b/files/device_table-unslung.txt @@ -30,15 +30,15 @@ /dev/rtc c 644 0 0 10 135 - - - /dev/scd b 664 0 0 11 0 0 1 4 /dev/sda b 664 0 0 8 0 - - - -/dev/sda b 664 0 0 8 1 1 1 5 +/dev/sda b 664 0 0 8 1 1 1 16 /dev/sdb b 664 0 0 8 16 - - - -/dev/sdb b 664 0 0 8 17 1 1 5 +/dev/sdb b 664 0 0 8 17 1 1 16 /dev/sdc b 664 0 0 8 32 - - - -/dev/sdc b 664 0 0 8 33 1 1 5 +/dev/sdc b 664 0 0 8 33 1 1 16 /dev/sdd b 664 0 0 8 48 - - - -/dev/sdd b 664 0 0 8 49 1 1 5 +/dev/sdd b 664 0 0 8 49 1 1 16 /dev/sde b 664 0 0 8 64 - - - -/dev/sde b 664 0 0 8 65 1 1 5 +/dev/sde b 664 0 0 8 65 1 1 16 /dev/st c 664 0 0 9 0 0 1 4 /dev/tty c 666 0 0 5 0 - - - /dev/tty c 644 0 0 4 0 0 1 10 |