[oe-commits] org.oe.dev merge of 'bed1f45d5c2e76fbd336580d09caef10c613f256'

rwhitby commit openembedded-commits at lists.openembedded.org
Thu Dec 27 23:07:46 UTC 2007


merge of 'bed1f45d5c2e76fbd336580d09caef10c613f256'
     and 'fbb56d5a76093891efdc7abc682059fd0436d4be'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: adce0d7b339a936c3f4417e986f731cddd2d5ff7
ViewMTN: http://monotone.openembedded.org/revision/info/adce0d7b339a936c3f4417e986f731cddd2d5ff7
Files:
1
packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch
packages/qt4/qtopia-core/build-tools.patch
classes/autotools.bbclass
classes/binconfig.bbclass
conf/distro/angstrom-2008.1.conf
packages/apr/apr-util_1.2.7.bb
packages/apr/apr_1.2.7.bb
packages/kexec/kexec-tools_1.101.bb
packages/linux/linux-rp-2.6.23/defconfig-akita
packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
packages/linux/linux-rp-2.6.23/defconfig-c7x0
packages/linux/linux-rp-2.6.23/defconfig-collie
packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
packages/linux/linux-rp-2.6.23/defconfig-hx2000
packages/linux/linux-rp-2.6.23/defconfig-poodle
packages/linux/linux-rp-2.6.23/defconfig-qemuarm
packages/linux/linux-rp-2.6.23/defconfig-qemux86
packages/linux/linux-rp-2.6.23/defconfig-spitz
packages/linux/linux-rp-2.6.23/defconfig-tosa
packages/linux/linux-rp-2.6.23/defconfig-zylonite
packages/linux/linux-rp_2.6.23.bb
packages/mtd/mtd-utils_1.0.0+git.bb
packages/qt4/files/0008-backport-qt-lib-infix.patch
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
packages/qt4/qtopia-core.inc
packages/meta/slugos-packages.bb
Diffs:

#
# mt diff -rbed1f45d5c2e76fbd336580d09caef10c613f256 -radce0d7b339a936c3f4417e986f731cddd2d5ff7
#
# 
# 
# add_file "packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch"
#  content [5979f478f97d3d977f2cc97804b69580432cbfc4]
# 
# add_file "packages/qt4/qtopia-core/build-tools.patch"
#  content [6612f0ee0a17e0dbc12ea3bed6fa66232e887240]
# 
# patch "classes/autotools.bbclass"
#  from [e96cf316d44ecfcef44a4db7bddfb8d80facbdc7]
#    to [701ff1aa962fc32e4a4625ed4cce861e47ca5694]
# 
# patch "classes/binconfig.bbclass"
#  from [660275cce8f7fec339f68e7aa419d334663a5a21]
#    to [58dc018aedba1b26f08340968881e9b10ad2c6a0]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [db7d798ae0bfb0247447e34639d0beebb064abc6]
#    to [13f3d678fe8a5316bdf4bf2448984ad0f7fbc69e]
# 
# patch "packages/apr/apr-util_1.2.7.bb"
#  from [5bea7d4ba65baaae2f314e0e4725e74384c7d8c6]
#    to [662620cf3dc2aeaff4ac4ed3b34ed9acd9d2a39a]
# 
# patch "packages/apr/apr_1.2.7.bb"
#  from [9816898cd2e93fcd6a95f7506682ab0955872666]
#    to [f51f9d791644263063719fdd0f9d24f9a44f7134]
# 
# patch "packages/kexec/kexec-tools_1.101.bb"
#  from [90e71612793cff1e87109dcec8aa5c8a1894465f]
#    to [ca02155fb0738f03ed10922ed0662ff62515da42]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-akita"
#  from [4977ccc396bbd9ae697e9cd5ec6d8c34ff04d530]
#    to [ed35da5229e83c9d708876e35f815fd973a327b6]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-bootcdx86"
#  from [5558cdd18f447599d6ba549819dae3d99d919cbb]
#    to [fa2eb19850b6a1ebfd945edbc77af349a38f2833]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-c7x0"
#  from [511d465640921b0e994dbc25c4212fabf12ca150]
#    to [1245c4d3084a0f248fe10f90a1ef8eb1c2866f91]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-collie"
#  from [61e97e08b4342ff704be5b57783344f6d2834896]
#    to [9ffd9b1fadb6288179b7b23413e91d4eb9442460]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-htcuniversal"
#  from [c15ceaf3e170f40ee7b76bf8bd498450551060ad]
#    to [e857690d16edf59ddfac6eb26161fe53e4ed9699]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-hx2000"
#  from [ca400be76cfeca2feb187a33538407a633e15bc5]
#    to [bb743d9e1d64d7aabe5903f81e95963f04c5c72f]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-poodle"
#  from [7abd6d286f0381c0944b56f36a66ca2e73efd26b]
#    to [102b49ef0fabd205231bbb2cc1aa7c21d08b5000]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-qemuarm"
#  from [677d6694b1fa93712c468b324b1cda3ba60d1787]
#    to [91daad30a645e0041554eaa3129572f741f9363b]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-qemux86"
#  from [13ba6932d390681dfa74465511435d21ed675514]
#    to [9dc59c1b80636bf9fe0714da4db9b01f0129d2f4]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-spitz"
#  from [60f2f3675a8045720aebad8b900d6c464040e0e3]
#    to [a19c44d5fdb2d5af547aa8ccaf27eec19de9371e]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-tosa"
#  from [01f4884968a401014d287420a8a8d679c3b8feb2]
#    to [2e5f481df13fba16a4eecee773c4d1fc587016d6]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-zylonite"
#  from [3a9d67a339675e9dee9874ffed84dc3ba368eb0a]
#    to [b0d279ba0a0fa8b24c9626225ab8d48e1b615fb6]
# 
# patch "packages/linux/linux-rp_2.6.23.bb"
#  from [cd9a0399f2401ae21ff1d9fd0ce936b54fc165c9]
#    to [1f5858f24a5615fa3a5a1901c638b63a94ffa9db]
# 
# patch "packages/mtd/mtd-utils_1.0.0+git.bb"
#  from [28c59a29a8f4cc26b7723edd88cd3ee953be98f4]
#    to [db38f6e2d20f70fbb76af8a5fd01ade273c67858]
# 
# patch "packages/qt4/files/0008-backport-qt-lib-infix.patch"
#  from [38b864fb3010c2de2fe5c5a47fa3bae0247094b0]
#    to [4d071a20c1c343cfcae88bbb9c4c6ff6153db11f]
# 
# patch "packages/qt4/qt_packaging.inc"
#  from [fe6ac1892555890ed97bb2e3b8cb75239b6a442b]
#    to [49645ec215cac92b25eb2867013540ce7d7bd328]
# 
# patch "packages/qt4/qt_staging.inc"
#  from [138e3742b0fa71c3307af21a755fcc6e6f9c90da]
#    to [7cfc32182e50d232e37d0c6ff7a596d8ec467cc7]
# 
# patch "packages/qt4/qtopia-core.inc"
#  from [27e955f9b1f75f8581de52f9d083dd2df2ec13fa]
#    to [afdef9632312a739952146a0359c30d1fc64c12f]
# 
============================================================
--- packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch	5979f478f97d3d977f2cc97804b69580432cbfc4
+++ packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch	5979f478f97d3d977f2cc97804b69580432cbfc4
@@ -0,0 +1,294 @@
+---
+ kexec/arch/arm/kexec-zImage-arm.c |  259 ++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 252 insertions(+), 7 deletions(-)
+
+Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/arch/arm/kexec-zImage-arm.c	2007-12-26 21:17:07.000000000 +0000
++++ kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c	2007-12-27 01:24:25.000000000 +0000
+@@ -1,11 +1,83 @@
++/*
++ * - 08/21/2007 ATAG support added by Uli Luckas <u.luckas at road.de>
++ *
++ */
+ #define _GNU_SOURCE
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <limits.h>
++#include <stdint.h>
++#include <getopt.h>
++#include <arch/options.h>
++#include <asm/page.h>
+ #include "../../kexec.h"
+ 
++#define COMMAND_LINE_SIZE 1024
++#define BOOT_PARAMS_SIZE 1536
++
++struct tag_header {
++	uint32_t size;
++	uint32_t tag;
++};
++
++/* The list must start with an ATAG_CORE node */
++#define ATAG_CORE       0x54410001
++
++struct tag_core {
++	uint32_t flags;	    /* bit 0 = read-only */
++	uint32_t pagesize;
++	uint32_t rootdev;
++};
++
++/* it is allowed to have multiple ATAG_MEM nodes */
++#define ATAG_MEM	0x54410002
++
++struct tag_mem32 {
++	uint32_t   size;
++	uint32_t   start;  /* physical start address */
++};
++
++/* describes where the compressed ramdisk image lives (virtual address) */
++/*
++ * this one accidentally used virtual addresses - as such,
++ * it's deprecated.
++ */
++#define ATAG_INITRD     0x54410005
++
++/* describes where the compressed ramdisk image lives (physical address) */
++#define ATAG_INITRD2    0x54420005
++
++struct tag_initrd {
++        uint32_t start;    /* physical start address */
++        uint32_t size;     /* size of compressed ramdisk image in bytes */
++};
++
++/* command line: \0 terminated string */
++#define ATAG_CMDLINE    0x54410009
++
++struct tag_cmdline {
++	char    cmdline[1];     /* this is the minimum size */
++};
++
++/* The list ends with an ATAG_NONE node. */
++#define ATAG_NONE       0x00000000
++
++struct tag {
++	struct tag_header hdr;
++	union {
++		struct tag_core	 core;
++		struct tag_mem32	mem;
++		struct tag_initrd       initrd;
++		struct tag_cmdline      cmdline;
++	} u;
++};
++
++#define tag_next(t)     ((struct tag *)((uint32_t *)(t) + (t)->hdr.size))
++#define byte_size(t)    ((t)->hdr.size << 2)
++#define tag_size(type)  ((sizeof(struct tag_header) + sizeof(struct type) + 3) >> 2)
++
+ int zImage_arm_probe(const char *buf, off_t len)
+ {
+ 	/* 
+@@ -14,21 +86,194 @@ int zImage_arm_probe(const char *buf, of
+ 	 */	
+ 	return 0;
+ }
++
+ void zImage_arm_usage(void)
+ {
++	printf(	"     --command-line=STRING Set the kernel command line to STRING.\n"
++		"     --append=STRING       Set the kernel command line to STRING.\n"
++		"     --initrd=FILE         Use FILE as the kernel's initial ramdisk.\n"
++		"     --ramdisk=FILE        Use FILE as the kernel's initial ramdisk.\n"
++		);
+ }
+-int zImage_arm_load(int argc, char **argv, const char *buf, off_t len, 
++
++static
++struct tag * atag_read_tags(void)
++{
++	static unsigned long buf[BOOT_PARAMS_SIZE];
++	const char fn[]= "/proc/atags";
++	FILE *fp;
++	fp = fopen(fn, "r");
++	if (!fp) {
++		fprintf(stderr, "Cannot open %s: %s\n", 
++			fn, strerror(errno));
++		return NULL;
++	}
++
++	fread(buf, sizeof(buf[1]), BOOT_PARAMS_SIZE, fp);
++	if (ferror(fp)) {
++		fprintf(stderr, "Cannot read %s: %s\n",
++			fn, strerror(errno));
++		fclose(fp);
++		return NULL;
++	}
++
++	fclose(fp);
++	return (struct tag *) buf;
++}
++
++
++static
++int atag_arm_load(struct kexec_info *info, unsigned long base,
++	const char *command_line, off_t command_line_len,
++	const char *initrd, off_t initrd_len)
++{
++	struct tag *saved_tags = atag_read_tags();
++	char *buf;
++	off_t len;
++	struct tag *params;
++	uint32_t *initrd_start;
++	
++	buf = xmalloc(getpagesize());
++	if (!buf) {
++		fprintf(stderr, "Compiling ATAGs: out of memory\n");
++		return -1;
++	}
++
++	memset(buf, 0xff, getpagesize());
++	params = (struct tag *)buf;
++
++	if (saved_tags) {
++		// Copy tags
++		saved_tags = (struct tag *) saved_tags;
++		while(byte_size(saved_tags)) {
++			switch (saved_tags->hdr.tag) {
++			case ATAG_INITRD:
++			case ATAG_INITRD2:
++			case ATAG_CMDLINE:
++			case ATAG_NONE:
++				// skip these tags
++				break;
++			default:
++				// copy all other tags
++				memcpy(params, saved_tags, byte_size(saved_tags));
++				params = tag_next(params);
++			}
++			saved_tags = tag_next(saved_tags);
++		}
++	} else {
++		params->hdr.size = 2;
++		params->hdr.tag = ATAG_CORE;
++		params = tag_next(params);
++	}
++
++	if (initrd) {
++		params->hdr.size = tag_size(tag_initrd);
++		params->hdr.tag = ATAG_INITRD2;
++		initrd_start = &params->u.initrd.start;
++		params->u.initrd.size = initrd_len;
++		params = tag_next(params);
++	}
++
++	if (command_line) {
++		params->hdr.size = (sizeof(struct tag_header) + command_line_len + 3) >> 2;
++		params->hdr.tag = ATAG_CMDLINE;
++		memcpy(params->u.cmdline.cmdline, command_line,
++			command_line_len);
++		params->u.cmdline.cmdline[command_line_len - 1] = '\0';
++		params = tag_next(params);
++	}
++
++	params->hdr.size = 0;
++	params->hdr.tag = ATAG_NONE;
++
++	len = ((char *)params - buf) + sizeof(struct tag_header);
++
++	add_segment(info, buf, len, base, len);
++
++	if (initrd) {
++		struct memory_range *range;
++		int ranges;
++		get_memory_ranges(&range, &ranges);
++		*initrd_start = locate_hole(info, initrd_len, getpagesize(), range[0].start + 0x800000, ULONG_MAX, INT_MAX);
++		if (*initrd_start == ULONG_MAX)
++			return -1;
++		add_segment(info, initrd, initrd_len, *initrd_start, initrd_len);
++	}
++
++	return 0;
++}
++
++int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
+ 	struct kexec_info *info)
+ {
+ 	unsigned long base;
+-	unsigned int offset = 0x8000; /* 32k offset from memory start */
++	unsigned int atag_offset = 0x1000; /* 4k offset from memory start */
++	unsigned int offset = 0x8000;      /* 32k offset from memory start */
++	const char *command_line;
++	off_t command_line_len;
++	const char *ramdisk;
++	char *ramdisk_buf;
++	off_t ramdisk_length;
++	int opt;
++#define OPT_APPEND	'a'
++#define OPT_RAMDISK	'r'
++	static const struct option options[] = {
++		KEXEC_ARCH_OPTIONS
++		{ "command-line",	1, 0, OPT_APPEND },
++		{ "append",		1, 0, OPT_APPEND },
++		{ "initrd",		1, 0, OPT_RAMDISK },
++		{ "ramdisk",		1, 0, OPT_RAMDISK },
++		{ 0, 			0, 0, 0 },
++	};
++	static const char short_options[] = KEXEC_ARCH_OPT_STR "a:r:";
++
++	/*
++	 * Parse the command line arguments
++	 */
++	command_line = 0;
++	command_line_len = 0;
++	ramdisk = 0;
++	ramdisk_buf = 0;
++	ramdisk_length = 0;
++	while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) {
++		switch(opt) {
++		default:
++			/* Ignore core options */
++			if (opt < OPT_ARCH_MAX) {
++				break;
++			}
++		case '?':
++			usage();
++			return -1;
++		case OPT_APPEND:
++			command_line = optarg;
++			break;
++		case OPT_RAMDISK:
++			ramdisk = optarg;
++			break;
++		}
++	}
++	if (command_line) {
++		command_line_len = strlen(command_line) + 1;
++		if (command_line_len > COMMAND_LINE_SIZE)
++			command_line_len = COMMAND_LINE_SIZE;
++	}
++	if (ramdisk) {
++		ramdisk_buf = slurp_file(ramdisk, &ramdisk_length);
++	}
++
+ 	base = locate_hole(info,len+offset,0,0,ULONG_MAX,INT_MAX);
+ 	if (base == ULONG_MAX)
+-	{
+ 		return -1;
+-	}
+-	base += offset;
+-	add_segment(info,buf,len,base,len);
+-	info->entry = (void*)base;
++
++	if (atag_arm_load(info, base + atag_offset,
++			 command_line, command_line_len,
++			 ramdisk_buf, ramdisk_length)    == -1)
++		return -1;
++
++	add_segment(info, buf, len, base + offset, len);
++
++	info->entry = (void*)base + offset;
++
+ 	return 0;
+ }
============================================================
--- packages/qt4/qtopia-core/build-tools.patch	6612f0ee0a17e0dbc12ea3bed6fa66232e887240
+++ packages/qt4/qtopia-core/build-tools.patch	6612f0ee0a17e0dbc12ea3bed6fa66232e887240
@@ -0,0 +1,28 @@
+Do not disable tools, examples and demos for the QWS build. Use brute-force
+to do this.
+
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure	2007-12-27 16:30:36.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/configure	2007-12-27 16:30:52.000000000 +0100
+@@ -2265,13 +2265,13 @@
+     CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS"
+ 
+     # don't build tools by default when cross-compiling
+-    if [ "$PLATFORM" != "$XPLATFORM" ]; then
+-	CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
+-    fi
+-fi
+-for nobuild in $CFG_NOBUILD_PARTS; do
+-    CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
+-done
++    #if [ "$PLATFORM" != "$XPLATFORM" ]; then
++    #	CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
++    #fi
++fi
++#for nobuild in $CFG_NOBUILD_PARTS; do
++#    CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
++#done
+ if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then
+ #    echo
+ #    echo "WARNING: libs is a required part of the build."
============================================================
--- classes/autotools.bbclass	e96cf316d44ecfcef44a4db7bddfb8d80facbdc7
+++ classes/autotools.bbclass	701ff1aa962fc32e4a4625ed4cce861e47ca5694
@@ -174,6 +174,8 @@ autotools_stage_all() {
 	fi
 	if [ -d ${STAGE_TEMP}/${libdir} ]
 	then
+		find ${STAGE_TEMP}/${libdir} -name '*.la' -exec sed -i s,installed=yes,installed=no, {} \;
+
 		for i in ${STAGE_TEMP}/${libdir}/*.la
 		do
 			if [ ! -f "$i" ]; then
============================================================
--- classes/binconfig.bbclass	660275cce8f7fec339f68e7aa419d334663a5a21
+++ classes/binconfig.bbclass	58dc018aedba1b26f08340968881e9b10ad2c6a0
@@ -20,6 +20,8 @@ def get_binconfig_mangle(d):
 		s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'"
 		s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
 		s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
+		if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d):
+		    s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d)
 	return s
 
 BINCONFIG_GLOB ?= "*-config"
============================================================
--- conf/distro/angstrom-2008.1.conf	db7d798ae0bfb0247447e34639d0beebb064abc6
+++ conf/distro/angstrom-2008.1.conf	13f3d678fe8a5316bdf4bf2448984ad0f7fbc69e
@@ -53,7 +53,7 @@ PCMCIA_MANAGER = "pcmciautils"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
============================================================
--- packages/apr/apr-util_1.2.7.bb	5bea7d4ba65baaae2f314e0e4725e74384c7d8c6
+++ packages/apr/apr-util_1.2.7.bb	662620cf3dc2aeaff4ac4ed3b34ed9acd9d2a39a
@@ -14,12 +14,19 @@ EXTRA_OECONF = "--with-apr=${STAGING_BIN
 		--without-sqlite3 \
 		--with-expat=${STAGING_DIR_HOST}${layout_prefix}"
 
+
 inherit autotools lib_package binconfig
 
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
 do_configure() {
+  cp ${STAGING_DATADIR}/apr_rules.mk ${S}/build/rules.mk
   oe_runconf
 }
 
 do_stage() {
-	autotools_stage_all
+  autotools_stage_all
+  sed -i s,/usr/lib/libgdbm.la,-lgdbm,g   ${STAGING_LIBDIR}/libaprutil-1.la
+  sed -i s,/usr/lib/libexpat.la,-lexpat,g ${STAGING_LIBDIR}/libaprutil-1.la
+  sed -i s,/usr/lib/libapr-1.la,-lapr-1,g ${STAGING_LIBDIR}/libaprutil-1.la
 }
============================================================
--- packages/apr/apr_1.2.7.bb	9816898cd2e93fcd6a95f7506682ab0955872666
+++ packages/apr/apr_1.2.7.bb	f51f9d791644263063719fdd0f9d24f9a44f7134
@@ -9,10 +9,13 @@ inherit autotools lib_package binconfig
 
 inherit autotools lib_package binconfig
 
+OE_BINCONFIG_EXTRA_MA%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rfbb56d5a76093891efdc7abc682059fd0436d4be -radce0d7b339a936c3f4417e986f731cddd2d5ff7
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [c730d6f5cb0b4b5cace51f9bb454525ef5c59ab8]
#    to [58d718f42f82fb421411dd42902041d9826d43d7]
# 
============================================================
--- packages/meta/slugos-packages.bb	c730d6f5cb0b4b5cace51f9bb454525ef5c59ab8
+++ packages/meta/slugos-packages.bb	58d718f42f82fb421411dd42902041d9826d43d7
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r43"
+PR = "r44"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -250,6 +250,8 @@ DEPENDS = "\
 DEPENDS = "\
 	slugos-image \
 	slugos-native \
+	task-nas-server-everything \
+	task-proper-tools \
 	${SLUGOS_PACKAGES} \
 	${SLUGOS_EXTRA_PACKAGES} \
 	package-index \






More information about the Openembedded-commits mailing list