[oe-commits] org.oe.dev merge of '685f9c2bb963e57e2c7abc168ebc9bcb6c773b02'

[oe commit]

merge of '685f9c2bb963e57e2c7abc168ebc9bcb6c773b02'
     and 'f9a0a31057fa5ef412d342dce9c8933a0bcf3c1b'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: a6c6c8ca65ec928720b71675d12198c489833b73
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a6c6c8ca65ec928720b71675d12198c489833b73
Files:
1
packages/gsm/libgsmd_svn.bb
packages/netbase/netbase_4.21.bb
classes/nslu2-image.bbclass
packages/slugimage/slugimage.bb
packages/sysconf/sysconf_0.1.bb
Diffs:

#
# mt diff -r685f9c2bb963e57e2c7abc168ebc9bcb6c773b02 -ra6c6c8ca65ec928720b71675d12198c489833b73
#
# 
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [ba18b85f0257f53e5828885b83f426ca81e35c54]
#    to [5aab19e03e1570e7152f3ea4d344a1fc6b547ef4]
# 
# patch "packages/netbase/netbase_4.21.bb"
#  from [76c7f97c64e640ea8d7bc7502feea17671604ee4]
#    to [f31e4d10601a9cbc7c4ea866b9b6be430e8ca79b]
# 
============================================================
--- packages/gsm/libgsmd_svn.bb	ba18b85f0257f53e5828885b83f426ca81e35c54
+++ packages/gsm/libgsmd_svn.bb	5aab19e03e1570e7152f3ea4d344a1fc6b547ef4
@@ -1,11 +1,13 @@ PROVIDES += "gsmd"
 DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
 HOMEPAGE = "http://www.openmoko.org"
 LICENSE = "GPL LGPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
-PV = "0.1+svn${SRCDATE}"
-PR = "r16"
+PV = "0.1+svnr${SRCREV}"
+PR = "r17"
 
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
            file://default \
============================================================
--- packages/netbase/netbase_4.21.bb	76c7f97c64e640ea8d7bc7502feea17671604ee4
+++ packages/netbase/netbase_4.21.bb	f31e4d10601a9cbc7c4ea866b9b6be430e8ca79b
@@ -1,11 +1,13 @@ LICENSE = "GPL"
 DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r18"
+PR = "r19"
 
 inherit update-rc.d
 
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
 INITSCRIPT_NAME = "networking"
 INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
 # On MNCI etc, start very late so that our own apps come up faster


#
# mt diff -rf9a0a31057fa5ef412d342dce9c8933a0bcf3c1b -ra6c6c8ca65ec928720b71675d12198c489833b73
#
# 
# 
# patch "classes/nslu2-image.bbclass"
#  from [a5ee4ba7915dc9401db17a4feacd62ed9d48ce64]
#    to [80f02607f4bbcce93591afb8c7424a2ce9717511]
# 
# patch "packages/slugimage/slugimage.bb"
#  from [12221d8851ee9540126f46254adb1766c76974a7]
#    to [b1c154cff22e1258519e3cf7330adb5f73f8d887]
# 
# patch "packages/sysconf/sysconf_0.1.bb"
#  from [dff7d5d47a6573a359f77a265b99c669def549c2]
#    to [031d6f6df03a0d0c86b31775770bf4affba70200]
# 
============================================================
--- classes/nslu2-image.bbclass	a5ee4ba7915dc9401db17a4feacd62ed9d48ce64
+++ classes/nslu2-image.bbclass	80f02607f4bbcce93591afb8c7424a2ce9717511
@@ -13,6 +13,9 @@ nslu2_pack_image () {
 	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
+	slugimage -F -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-16mb.bin
 	rm -rf ${DEPLOY_DIR_IMAGE}/slug
 }
 
============================================================
--- packages/slugimage/slugimage.bb	12221d8851ee9540126f46254adb1766c76974a7
+++ packages/slugimage/slugimage.bb	b1c154cff22e1258519e3cf7330adb5f73f8d887
@@ -1,13 +1,13 @@ flash images for the Linksys NSLU2 devic
 # slugimage - normally built native, a perl script
 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 = "r10"
+PR = "r11"
 
 RDEPENDS = "perl"
 
-SLUGIMAGE_SVN_REV  ?= "82"
+SLUGIMAGE_SVN_REV  ?= "103"
 SLUGIMAGE_SVN_REPO ?= "http://svn.nslu2-linux.org/svnroot/slugimage/trunk"
 
 addtask svnfetch before do_configure after do_patch
============================================================
--- packages/sysconf/sysconf_0.1.bb	dff7d5d47a6573a359f77a265b99c669def549c2
+++ packages/sysconf/sysconf_0.1.bb	031d6f6df03a0d0c86b31775770bf4affba70200
@@ -1,9 +1,9 @@ RDEPENDS = "devio cpio findutils diffuti
 DESCRIPTION = "System Configuration save/restore functionality"
 SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "devio cpio findutils diffutils"
-PR = "r9"
+PR = "r10"
 
 # Currently, the scripts only support ixp4xx machines.
 # Feel free to add to the scripts ...
@@ -48,5 +48,3 @@ pkg_postrm() {
 	test -n "$D" && opt="-r $D"
 	update-rc.d $opt sysconfsetup remove
 }
-
-CONFFILES = "${sysconfdir}/default/conffiles"