merge of '262ebdec7339ba774fffa1aa586eb226acd32493'

     and '7ce1c09c2ab95fc13a699ae089ac05fba3e7024c'

6 files changed, 7 insertions, 6 deletions

diff --git a/classes/testlab.bbclass b/classes/testlab.bbclass
index ba0bc794e7..bb47ee877f 100644
--- a/classes/testlab.bbclass
+++ b/classes/testlab.bbclass
@@ -32,7 +32,7 @@ if [ -e  ${IMAGE_ROOTFS}/etc/opkg ] ; then
 	echo -e "digraph depends {\n    node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot
 
 	for pkg in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} list_installed | awk '{print $1}') ; do 
-    		opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | grep Filename | awk -F: '{print $2}'  >> ${TESTLAB_DIR}/installed-packages.txt
+		opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | awk '/Package/ {printf $2"_"} /Version/ {printf $2"_"} /Archi/ {print $2".ipk"}'  >> ${TESTLAB_DIR}/installed-packages.txt
 
     		for depends in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o  ${IMAGE_ROOTFS} info $pkg | grep Depends) ; do 
         		echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v Depends | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
@@ -57,7 +57,7 @@ if [ -e  ${IMAGE_ROOTFS}/etc/opkg ] ; then
 	#dot -Tpng -o ${TESTLAB_DIR}/image-dependencies-nokernel-nolibc-noupdate-nomodules.png ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate-nomodules.dot
 
 	for file in $(cat ${TESTLAB_DIR}/installed-packages.txt) ; do 
-     		du -k $(find ${DEPLOY_DIR_IPK} -name "$file") 
+     		du -k $(find ${DEPLOY_DIR_IPK} -name "$file") | head -n1
 	done | grep "\.ipk" | sed -e s:${DEPLOY_DIR_IPK}::g | sort -n -r | awk '{print $1 "\tKiB " $2}' > ${TESTLAB_DIR}/installed-package-sizes.txt
 fi
 }
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index 23c8942ab2..15e3c85ec5 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -17,7 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # used by some images
-IMAGE_FSTYPES ?= "jffs2"
+IMAGE_FSTYPES ?= "tar.bz2 jffs2"
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index 77f9fdf34e..0bf8988ac2 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -16,6 +16,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # used by some images
+IMAGE_FSTYPES ?= "tar.bz2 jffs2"
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
index de78fc3741..555248c29d 100644
--- a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
+++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
@@ -163,7 +163,7 @@ CONFIG_MACH_FSG=y
 # IXP4xx Options
 #
 CONFIG_DMABOUNCE=y
-CONFIG_DMABOUNCE_DEBUG=y
+# CONFIG_DMABOUNCE_DEBUG is not set
 # CONFIG_IXP4XX_INDIRECT_PCI is not set
 CONFIG_IXP4XX_QMGR=y
 CONFIG_IXP4XX_NPE=y
diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
index 2a382b34b3..d4cfa7c6fd 100644
--- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
+++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
@@ -163,7 +163,7 @@ CONFIG_MACH_FSG=y
 # IXP4xx Options
 #
 CONFIG_DMABOUNCE=y
-CONFIG_DMABOUNCE_DEBUG=y
+# CONFIG_DMABOUNCE_DEBUG is not set
 # CONFIG_IXP4XX_INDIRECT_PCI is not set
 CONFIG_IXP4XX_QMGR=y
 CONFIG_IXP4XX_NPE=y
diff --git a/packages/linux/linux-ixp4xx_2.6.24.4.bb b/packages/linux/linux-ixp4xx_2.6.24.4.bb
index 1be0724e2f..1964c23839 100644
--- a/packages/linux/linux-ixp4xx_2.6.24.4.bb
+++ b/packages/linux/linux-ixp4xx_2.6.24.4.bb
@@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.24.4"
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-# PR = "r1"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
 	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \