[oe-commits] org.oe.dev merge of '38838ab61d84fb4ed9c36e21484735a9eca09c9c'

[mickeyl commit]

merge of '38838ab61d84fb4ed9c36e21484735a9eca09c9c'
     and '9febc982a33100b03781aa11d0b9064c71b21683'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 5d62b8fe778e8966d66a34c672dabaaef1a22b3c
ViewMTN: http://monotone.openembedded.org/revision/info/5d62b8fe778e8966d66a34c672dabaaef1a22b3c
Files:
1
conf/machine/at32stk1000.conf
packages/images/unslung-image.bb
packages/meta/slugos-packages.bb
packages/openocd/openocd_svn.bb
packages/rsync/rsync.inc
packages/rsync/rsync_2.6.9.bb
packages/rsync/rsync_3.0.0.bb
Diffs:

#
# mt diff -r38838ab61d84fb4ed9c36e21484735a9eca09c9c -r5d62b8fe778e8966d66a34c672dabaaef1a22b3c
#
#
#
# patch "conf/machine/at32stk1000.conf"
#  from [3d5142529536576aea6056c6d761540974caa5ac]
#    to [163fd78fdfe07eb3befe4b759102820ed434730b]
# 
# patch "packages/images/unslung-image.bb"
#  from [e4cf81045fb8a8e211e464905d1b307c49987663]
#    to [738ce981801bef8a0c76499a9524887eeb1547ff]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [a8de050f9b9bde46ec2fe91cdf9d93c69da445cb]
#    to [46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb]
# 
# patch "packages/openocd/openocd_svn.bb"
#  from [ff4b08ed923a74c3efa4730980288907a11baeb7]
#    to [5863de22800841c9bcd0fe5b4014ef3d911f91a2]
#
============================================================
--- conf/machine/at32stk1000.conf	3d5142529536576aea6056c6d761540974caa5ac
+++ conf/machine/at32stk1000.conf	163fd78fdfe07eb3befe4b759102820ed434730b
@@ -22,8 +22,9 @@ KERNEL_IMAGETYPE = "uImage"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "1.1.4"
+PREFERRED_VERSION_u-boot = "1.3.2"
 
+UBOOT_MACHINE = "atstk1002_config"
 UBOOT_ENTRYPOINT = "0x90000000"
 UBOOT_LOADADDRESS = "0x10000000"
 
============================================================
--- packages/images/unslung-image.bb	e4cf81045fb8a8e211e464905d1b307c49987663
+++ packages/images/unslung-image.bb	738ce981801bef8a0c76499a9524887eeb1547ff
@@ -100,4 +100,12 @@ nslu2_pack_image () {
 		-m ${STAGING_FIRMWARE_DIR}/NPE-B \
 		-t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
 		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin
+	slugimage -F -p \
+		-b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
+		-s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \
+		-k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \
+		-r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+		-m ${STAGING_FIRMWARE_DIR}/NPE-B \
+		-t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
+		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin
 }
============================================================
--- packages/meta/slugos-packages.bb	a8de050f9b9bde46ec2fe91cdf9d93c69da445cb
+++ packages/meta/slugos-packages.bb	46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r50"
+PR = "r51"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -176,6 +176,7 @@ SLUGOS_PACKAGES = "\
 	openobex-apps \
 	openntpd \
 	openobex \
+	openocd \
 	openssh \
 	openvpn \
 	patch \
@@ -216,6 +217,7 @@ SLUGOS_PACKAGES = "\
 	sudo \
 	sysfsutils \
 	tar \
+	task-mokogateway-everything \
 	tcpdump \
 	thttpd \
 	tiff \
@@ -262,7 +264,6 @@ SLUGOS_BROKEN_PACKAGES = "\
 	pwc \
 	qc-usb-messenger \
 	syslog-ng \
-	openocd task-mokogateway-everything \
 	task-native-sdk \
 	unionfs-modules unionfs-utils \
 	wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
============================================================
--- packages/openocd/openocd_svn.bb	ff4b08ed923a74c3efa4730980288907a11baeb7
+++ packages/openocd/openocd_svn.bb	5863de22800841c9bcd0fe5b4014ef3d911f91a2
@@ -2,7 +2,7 @@ PV = "0.0+r${SRCREV}"
 HOMEPAGE = "http://openocd.berlios.de/"
 LICENSE = "GPL"
 PV = "0.0+r${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit autotools
 
@@ -10,4 +10,5 @@ S = "${WORKDIR}/trunk"
            file://openocd-link-static.patch;patch=1"
 S = "${WORKDIR}/trunk"
 
+DEPENDS = "libftdi"
 EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"  


#
# mt diff -r9febc982a33100b03781aa11d0b9064c71b21683 -r5d62b8fe778e8966d66a34c672dabaaef1a22b3c
#
#
#
# patch "packages/rsync/rsync.inc"
#  from [7c3e306cf41e043732b6fedbc8c41ebc491fedaf]
#    to [1d1f2cbe00f4779bdc3dc7f9689611d817e90259]
# 
# patch "packages/rsync/rsync_2.6.9.bb"
#  from [46d56c1ae65397da35a2b8871cfecde62e0a382e]
#    to [1b1f42efd8d5dc944a9638cd0678259c995c08dd]
# 
# patch "packages/rsync/rsync_3.0.0.bb"
#  from [265d3e5b7ec96ad6b092880621ccd67844dd9dc7]
#    to [dd9114bcedbdbe8b612946916a35fe4a662cd34c]
#
============================================================
--- packages/rsync/rsync.inc	7c3e306cf41e043732b6fedbc8c41ebc491fedaf
+++ packages/rsync/rsync.inc	1d1f2cbe00f4779bdc3dc7f9689611d817e90259
@@ -7,6 +7,8 @@ inherit autotools
 
 inherit autotools
 
+SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz"
+
 EXTRA_OEMAKE='STRIP=""'
 
 do_install_append() {
============================================================
--- packages/rsync/rsync_2.6.9.bb	46d56c1ae65397da35a2b8871cfecde62e0a382e
+++ packages/rsync/rsync_2.6.9.bb	1b1f42efd8d5dc944a9638cd0678259c995c08dd
@@ -2,5 +2,4 @@ PR = "r2"
 
 PR = "r2"
 
+SRC_URI += "file://rsyncd.conf"
-SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \
-           file://rsyncd.conf"
============================================================
--- packages/rsync/rsync_3.0.0.bb	265d3e5b7ec96ad6b092880621ccd67844dd9dc7
+++ packages/rsync/rsync_3.0.0.bb	dd9114bcedbdbe8b612946916a35fe4a662cd34c
@@ -2,9 +2,10 @@ PR = "r0"
 
 PR = "r0"
 
-SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \
-           file://m4.patch;patch=1 \
-           file://rsyncd.conf"
+SRC_URI += "\
+  file://m4.patch;patch=1 \
+  file://rsyncd.conf \
+"
 
 do_compile_prepend() {
         sed -i "s/conf_stop make_stop//" Makefile