[oe-commits] org.oe.dev slugos-image: Removed Apex from the image

[rwhitby commit]

slugos-image: Removed Apex from the image

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 4babe1caf820e719d27c7ed13d9518351ba729f3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4babe1caf820e719d27c7ed13d9518351ba729f3
Files:
1
packages/images/slugos-image.bb
Diffs:

#
# mt diff -r5e2224cae1661259c53ce98a72e5033cdb12f24a -r4babe1caf820e719d27c7ed13d9518351ba729f3
#
# 
# 
# patch "packages/images/slugos-image.bb"
#  from [7965eb6e406846e422367ea06a9a84159f5701c2]
#    to [6874aabb6f1eef6c77d9d9c2c4177e32a54bbf26]
# 
============================================================
--- packages/images/slugos-image.bb	7965eb6e406846e422367ea06a9a84159f5701c2
+++ packages/images/slugos-image.bb	6874aabb6f1eef6c77d9d9c2c4177e32a54bbf26
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Generic SlugOS image"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r43"
+PR = "r44"
 
 COMPATIBLE_MACHINE = "nslu2"
 
@@ -112,7 +112,7 @@ PACK_IMAGE += "${@['', 'slugos_pack_imag
 # 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 += "${@['', 'slugos_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}"
-PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}"
+PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}"
 
 NSLU2_SLUGIMAGE_ARGS ?= ""
 
@@ -122,15 +122,14 @@ slugos_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${SITEINFO_ENDIANESS} \
 		${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 -L apex.bin -k vmlinuz \
-		-r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \
+	slugimage -p -b RedBoot -s SysConf -k vmlinuz \
+		-r Ramdisk:1,Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \
 		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin \
 		${NSLU2_SLUGIMAGE_ARGS}
 	rm -rf ${DEPLOY_DIR_IMAGE}/slug