[STABLE] Some fixes from .dev tree

[STABLE] Some fixes from .dev tree

[Marcin Juszkiewicz]

All changes were tested for building on Debian 'sid'/amd64.

Targets were:

- glibc: at91sam9263ek, qemuarm, qemux86, vortex86sx, beagleboard
- uclibc: atngw100, at91sam9263ek, qemuarm, qemux86, vortex86sx, beagleboard

[STABLE][PATCH 1/1] busybox 1.13.2: Add more upstream patches, bump PR

Some updates/fixes from upstream.

[STABLE][PATCH 1/1] tracker: added libgnomecanvas to dependencies

I had tracker failure during do_configure due to lack of libgnomecanvas.

[STABLE][PATCH 1/1] e2fsprogs_1.41.4.bb : remove bogus override of do_configure which breaks
[STABLE][PATCH 1/1] e2fsprogs: fix compile to use 3 args so it works.
[STABLE][PATCH 1/1] e2fsprogs 1.41.4: depends on gettext-native, due to the removal of do_configure

Those 3 make e2fsprogs build for uclibc systems.

[STABLE][PATCH 1/1] util-linux-ng: Fixed dangling symlinks.
[STABLE][PATCH 1/1] util-linux-ng: depend on virtual/libintl to pass building with uclibc
[STABLE][PATCH 1/1] checksums.ini: added checksum for util-linux-ng 2.13.1

Those fix 2.13.1 SRC_URI and make util-linux-ng build for uclibc.

[STABLE][PATCH 1/1] hostap-utils-0.4.7: use LDFLAGS (fixes QA error)
[STABLE][PATCH 1/1] irda-utils: add patch to use LDFLAGS (fixes QA error)
[STABLE][PATCH 1/1] uclibc: use LDFLAGS for ldd and ldconfig (fixes QA error)

QA fixes.

[STABLE][STABLE][PATCH 1/1] busybox 1.13.2: Add more upstream patches, bump PR

[Marcin Juszkiewicz]

From: Tom Rini <trini@kernel.crashing.org>

This adds the awk, killall, printf, syslogd, top24, unzip and wget patches
from http://busybox.net/downloads/fixes-1.13.2/
---
 .../busybox-1.13.2/busybox-1.13.2-awk.patch        |   46 ++++++++++++++++++++
 .../busybox-1.13.2/busybox-1.13.2-killall.patch    |   17 +++++++
 .../busybox-1.13.2/busybox-1.13.2-printf.patch     |   21 +++++++++
 .../busybox-1.13.2/busybox-1.13.2-syslogd.patch    |   30 +++++++++++++
 .../busybox-1.13.2/busybox-1.13.2-top24.patch      |   12 +++++
 .../busybox-1.13.2/busybox-1.13.2-unzip.patch      |   12 +++++
 .../busybox-1.13.2/busybox-1.13.2-wget.patch       |   41 +++++++++++++++++
 recipes/busybox/busybox_1.13.2.bb                  |    9 +++-
 8 files changed, 187 insertions(+), 1 deletions(-)
 create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch
 create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch
 create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch
 create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch
 create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch
 create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch
 create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch

diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch
new file mode 100644
index 0000000..0a5e680
--- /dev/null
+++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch
@@ -0,0 +1,46 @@
+diff -urpN busybox-1.13.2/editors/awk.c busybox-1.13.2-awk/editors/awk.c
+--- busybox-1.13.2/editors/awk.c	2008-11-09 18:28:21.000000000 +0100
++++ busybox-1.13.2-awk/editors/awk.c	2009-02-26 12:17:05.000000000 +0100
+@@ -392,8 +392,12 @@ static const uint16_t PRIMES[] ALIGN2 = 
+ 
+ 
+ /* Globals. Split in two parts so that first one is addressed
+- * with (mostly short) negative offsets */
++ * with (mostly short) negative offsets.
++ * NB: it's unsafe to put members of type "double"
++ * into globals2 (gcc may fail to align them).
++ */
+ struct globals {
++	double t_double;
+ 	chain beginseq, mainseq, endseq;
+ 	chain *seq;
+ 	node *break_ptr, *continue_ptr;
+@@ -442,16 +446,16 @@ struct globals2 {
+ 	tsplitter exec_builtin__tspl;
+ 
+ 	/* biggest and least used members go last */
+-	double t_double;
+ 	tsplitter fsplitter, rsplitter;
+ };
+ #define G1 (ptr_to_globals[-1])
+ #define G (*(struct globals2 *)ptr_to_globals)
+ /* For debug. nm --size-sort awk.o | grep -vi ' [tr] ' */
+-/* char G1size[sizeof(G1)]; - 0x6c */
+-/* char Gsize[sizeof(G)]; - 0x1cc */
++/*char G1size[sizeof(G1)]; - 0x74 */
++/*char Gsize[sizeof(G)]; - 0x1c4 */
+ /* Trying to keep most of members accessible with short offsets: */
+-/* char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */
++/*char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */
++#define t_double     (G1.t_double    )
+ #define beginseq     (G1.beginseq    )
+ #define mainseq      (G1.mainseq     )
+ #define endseq       (G1.endseq      )
+@@ -479,7 +483,6 @@ struct globals2 {
+ #define t_info       (G.t_info      )
+ #define t_tclass     (G.t_tclass    )
+ #define t_string     (G.t_string    )
+-#define t_double     (G.t_double    )
+ #define t_lineno     (G.t_lineno    )
+ #define t_rollback   (G.t_rollback  )
+ #define intvar       (G.intvar      )
diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch
new file mode 100644
index 0000000..9524f52
--- /dev/null
+++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch
@@ -0,0 +1,17 @@
+--- busybox-1.13.2/include/libbb.h	Wed Dec 31 04:06:45 2008
++++ busybox-1.13.2-killall/include/libbb.h	Sat Feb 14 02:41:18 2009
+@@ -1275,7 +1275,13 @@
+ 	PSSCAN_UTIME    = 1 << 13,
+ 	PSSCAN_TTY      = 1 << 14,
+ 	PSSCAN_SMAPS	= (1 << 15) * ENABLE_FEATURE_TOPMEM,
+-	PSSCAN_ARGVN    = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF),
++	/* NB: used by find_pid_by_name(). Any applet using it
++	 * needs to be mentioned here. */
++	PSSCAN_ARGVN    = (1 << 16) * (ENABLE_KILLALL
++				|| ENABLE_PGREP || ENABLE_PKILL
++				|| ENABLE_PIDOF
++				|| ENABLE_SESTATUS 
++				),
+ 	USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,)
+ 	PSSCAN_START_TIME = 1 << 18,
+ 	PSSCAN_CPU      = 1 << 19,
diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch
new file mode 100644
index 0000000..281d457
--- /dev/null
+++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch
@@ -0,0 +1,21 @@
+diff -urpN busybox-1.13.2/coreutils/printf.c busybox-1.13.2-printf/coreutils/printf.c
+--- busybox-1.13.2/coreutils/printf.c	2008-12-31 04:06:45.000000000 +0100
++++ busybox-1.13.2-printf/coreutils/printf.c	2009-03-03 15:13:12.000000000 +0100
+@@ -139,14 +139,14 @@ static void print_direc(char *format, un
+ 	char saved;
+ 	char *have_prec, *have_width;
+ 
++	saved = format[fmt_length];
++	format[fmt_length] = '\0';
++
+ 	have_prec = strstr(format, ".*");
+ 	have_width = strchr(format, '*');
+ 	if (have_width - 1 == have_prec)
+ 		have_width = NULL;
+ 
+-	saved = format[fmt_length];
+-	format[fmt_length] = '\0';
+-
+ 	switch (format[fmt_length - 1]) {
+ 	case 'c':
+ 		printf(format, *argument);
diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch
new file mode 100644
index 0000000..1c24cdc
--- /dev/null
+++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch
@@ -0,0 +1,30 @@
+diff -urpN busybox-1.13.2/sysklogd/syslogd.c busybox-1.13.2-syslogd/sysklogd/syslogd.c
+--- busybox-1.13.2/sysklogd/syslogd.c	2008-11-09 18:28:03.000000000 +0100
++++ busybox-1.13.2-syslogd/sysklogd/syslogd.c	2009-03-08 02:03:24.000000000 +0100
+@@ -301,17 +301,23 @@ static void log_locally(time_t now, char
+ 	}
+ #endif
+ 	if (G.logFD >= 0) {
++		/* Reopen log file every second. This allows admin
++		 * to delete the file and not worry about restarting us.
++		 * This costs almost nothing since it happens
++		 * _at most_ once a second.
++		 */
+ 		if (!now)
+ 			now = time(NULL);
+ 		if (G.last_log_time != now) {
+-			G.last_log_time = now; /* reopen log file every second */
++			G.last_log_time = now;
+ 			close(G.logFD);
+ 			goto reopen;
+ 		}
+ 	} else {
+  reopen:
+-		G.logFD = device_open(G.logFilePath, O_WRONLY | O_CREAT
+-					| O_NOCTTY | O_APPEND | O_NONBLOCK);
++		G.logFD = open(G.logFilePath, O_WRONLY | O_CREAT
++					| O_NOCTTY | O_APPEND | O_NONBLOCK,
++					0666);
+ 		if (G.logFD < 0) {
+ 			/* cannot open logfile? - print to /dev/console then */
+ 			int fd = device_open(DEV_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK);
diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch
new file mode 100644
index 0000000..25ee861
--- /dev/null
+++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.13.2/procps/top.c busybox-1.13.2-top24/procps/top.c
+--- busybox-1.13.2/procps/top.c	2008-11-09 18:28:20.000000000 +0100
++++ busybox-1.13.2-top24/procps/top.c	2009-03-02 22:24:31.000000000 +0100
+@@ -200,7 +200,7 @@ static NOINLINE int read_cpu_jiffy(FILE 
+ 			&p_jif->usr, &p_jif->nic, &p_jif->sys, &p_jif->idle,
+ 			&p_jif->iowait, &p_jif->irq, &p_jif->softirq,
+ 			&p_jif->steal);
+-	if (ret > 4) {
++	if (ret >= 4) {
+ 		p_jif->total = p_jif->usr + p_jif->nic + p_jif->sys + p_jif->idle
+ 			+ p_jif->iowait + p_jif->irq + p_jif->softirq + p_jif->steal;
+ 		/* procps 2.x does not count iowait as busy time */
diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch
new file mode 100644
index 0000000..6b3f713
--- /dev/null
+++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.13.2/archival/unzip.c busybox-1.13.2-unzip/archival/unzip.c
+--- busybox-1.13.2/archival/unzip.c	2008-11-09 18:28:02.000000000 +0100
++++ busybox-1.13.2-unzip/archival/unzip.c	2009-02-26 12:17:21.000000000 +0100
+@@ -140,7 +140,7 @@ struct BUG_cde_header_must_be_16_bytes {
+ };
+ 
+ #define FIX_ENDIANNESS_CDE(cde_header) do { \
+-	(cde_header).formatted.cds_offset = SWAP_LE16((cde_header).formatted.cds_offset); \
++	(cde_header).formatted.cds_offset = SWAP_LE32((cde_header).formatted.cds_offset); \
+ } while (0)
+ 
+ enum { zip_fd = 3 };
diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch
new file mode 100644
index 0000000..862467f
--- /dev/null
+++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch
@@ -0,0 +1,41 @@
+diff -urpN busybox-1.13.2/networking/wget.c busybox-1.13.2-wget/networking/wget.c
+--- busybox-1.13.2/networking/wget.c	2008-11-09 18:27:59.000000000 +0100
++++ busybox-1.13.2-wget/networking/wget.c	2009-03-02 16:07:12.000000000 +0100
+@@ -417,15 +417,17 @@ int wget_main(int argc UNUSED_PARAM, cha
+ 		KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location
+ 	};
+ 	enum {
+-		WGET_OPT_CONTINUE   = 0x1,
+-		WGET_OPT_SPIDER	    = 0x2,
+-		WGET_OPT_QUIET      = 0x4,
+-		WGET_OPT_OUTNAME    = 0x8,
+-		WGET_OPT_PREFIX     = 0x10,
+-		WGET_OPT_PROXY      = 0x20,
+-		WGET_OPT_USER_AGENT = 0x40,
+-		WGET_OPT_PASSIVE    = 0x80,
+-		WGET_OPT_HEADER     = 0x100,
++		WGET_OPT_CONTINUE   = (1 << 0),
++		WGET_OPT_SPIDER	    = (1 << 1),
++		WGET_OPT_QUIET      = (1 << 2),
++		WGET_OPT_OUTNAME    = (1 << 3),
++		WGET_OPT_PREFIX     = (1 << 4),
++		WGET_OPT_PROXY      = (1 << 5),
++		WGET_OPT_USER_AGENT = (1 << 6),
++		WGET_OPT_RETRIES    = (1 << 7),
++		WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 8),
++		WGET_OPT_PASSIVE    = (1 << 9),
++		WGET_OPT_HEADER     = (1 << 10),
+ 	};
+ #if ENABLE_FEATURE_WGET_LONG_OPTIONS
+ 	static const char wget_longopts[] ALIGN1 =
+@@ -437,6 +439,10 @@ int wget_main(int argc UNUSED_PARAM, cha
+ 		"directory-prefix\0" Required_argument "P"
+ 		"proxy\0"            Required_argument "Y"
+ 		"user-agent\0"       Required_argument "U"
++		/* Ignored: */
++		// "tries\0"            Required_argument "t"
++		// "timeout\0"          Required_argument "T"
++		/* Ignored (we always use PASV): */
+ 		"passive-ftp\0"      No_argument       "\xff"
+ 		"header\0"           Required_argument "\xfe"
+ 		;
diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb
index 8ecbc1e..602e782 100644
--- a/recipes/busybox/busybox_1.13.2.bb
+++ b/recipes/busybox/busybox_1.13.2.bb
@@ -1,13 +1,20 @@
 require busybox.inc
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+  file://busybox-1.13.2-awk.patch;patch=1 \
   file://busybox-1.13.2-depmod.patch;patch=1 \
   file://busybox-1.13.2-init.patch;patch=1 \
+  file://busybox-1.13.2-killall.patch;patch=1 \
   file://busybox-1.13.2-mdev.patch;patch=1 \
   file://busybox-1.13.2-modprobe.patch;patch=1 \
+  file://busybox-1.13.2-printf.patch;patch=1 \
+  file://busybox-1.13.2-syslogd.patch;patch=1 \
   file://busybox-1.13.2-tar.patch;patch=1 \
+  file://busybox-1.13.2-top24.patch;patch=1 \
+  file://busybox-1.13.2-unzip.patch;patch=1 \
+  file://busybox-1.13.2-wget.patch;patch=1 \
   \
   file://udhcpscript.patch;patch=1 \
   file://udhcpc-fix-nfsroot.patch;patch=1 \
-- 
1.6.2.3

Re: [STABLE][STABLE][PATCH 1/1] busybox 1.13.2: Add more upstream patches, bump PR

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>


On 20-04-09 17:24, Marcin Juszkiewicz wrote:
> From: Tom Rini<trini@kernel.crashing.org>
>
> This adds the awk, killall, printf, syslogd, top24, unzip and wget patches
> from http://busybox.net/downloads/fixes-1.13.2/
> ---
>   .../busybox-1.13.2/busybox-1.13.2-awk.patch        |   46 ++++++++++++++++++++
>   .../busybox-1.13.2/busybox-1.13.2-killall.patch    |   17 +++++++
>   .../busybox-1.13.2/busybox-1.13.2-printf.patch     |   21 +++++++++
>   .../busybox-1.13.2/busybox-1.13.2-syslogd.patch    |   30 +++++++++++++
>   .../busybox-1.13.2/busybox-1.13.2-top24.patch      |   12 +++++
>   .../busybox-1.13.2/busybox-1.13.2-unzip.patch      |   12 +++++
>   .../busybox-1.13.2/busybox-1.13.2-wget.patch       |   41 +++++++++++++++++
>   recipes/busybox/busybox_1.13.2.bb                  |    9 +++-
>   8 files changed, 187 insertions(+), 1 deletions(-)
>   create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch
>   create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch
>   create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch
>   create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch
>   create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch
>   create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch
>   create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch
>
> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch
> new file mode 100644
> index 0000000..0a5e680
> --- /dev/null
> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch
> @@ -0,0 +1,46 @@
> +diff -urpN busybox-1.13.2/editors/awk.c busybox-1.13.2-awk/editors/awk.c
> +--- busybox-1.13.2/editors/awk.c	2008-11-09 18:28:21.000000000 +0100
> ++++ busybox-1.13.2-awk/editors/awk.c	2009-02-26 12:17:05.000000000 +0100
> +@@ -392,8 +392,12 @@ static const uint16_t PRIMES[] ALIGN2 =
> +
> +
> + /* Globals. Split in two parts so that first one is addressed
> +- * with (mostly short) negative offsets */
> ++ * with (mostly short) negative offsets.
> ++ * NB: it's unsafe to put members of type "double"
> ++ * into globals2 (gcc may fail to align them).
> ++ */
> + struct globals {
> ++	double t_double;
> + 	chain beginseq, mainseq, endseq;
> + 	chain *seq;
> + 	node *break_ptr, *continue_ptr;
> +@@ -442,16 +446,16 @@ struct globals2 {
> + 	tsplitter exec_builtin__tspl;
> +
> + 	/* biggest and least used members go last */
> +-	double t_double;
> + 	tsplitter fsplitter, rsplitter;
> + };
> + #define G1 (ptr_to_globals[-1])
> + #define G (*(struct globals2 *)ptr_to_globals)
> + /* For debug. nm --size-sort awk.o | grep -vi ' [tr] ' */
> +-/* char G1size[sizeof(G1)]; - 0x6c */
> +-/* char Gsize[sizeof(G)]; - 0x1cc */
> ++/*char G1size[sizeof(G1)]; - 0x74 */
> ++/*char Gsize[sizeof(G)]; - 0x1c4 */
> + /* Trying to keep most of members accessible with short offsets: */
> +-/* char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */
> ++/*char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */
> ++#define t_double     (G1.t_double    )
> + #define beginseq     (G1.beginseq    )
> + #define mainseq      (G1.mainseq     )
> + #define endseq       (G1.endseq      )
> +@@ -479,7 +483,6 @@ struct globals2 {
> + #define t_info       (G.t_info      )
> + #define t_tclass     (G.t_tclass    )
> + #define t_string     (G.t_string    )
> +-#define t_double     (G.t_double    )
> + #define t_lineno     (G.t_lineno    )
> + #define t_rollback   (G.t_rollback  )
> + #define intvar       (G.intvar      )
> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch
> new file mode 100644
> index 0000000..9524f52
> --- /dev/null
> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch
> @@ -0,0 +1,17 @@
> +--- busybox-1.13.2/include/libbb.h	Wed Dec 31 04:06:45 2008
> ++++ busybox-1.13.2-killall/include/libbb.h	Sat Feb 14 02:41:18 2009
> +@@ -1275,7 +1275,13 @@
> + 	PSSCAN_UTIME    = 1<<  13,
> + 	PSSCAN_TTY      = 1<<  14,
> + 	PSSCAN_SMAPS	= (1<<  15) * ENABLE_FEATURE_TOPMEM,
> +-	PSSCAN_ARGVN    = (1<<  16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF),
> ++	/* NB: used by find_pid_by_name(). Any applet using it
> ++	 * needs to be mentioned here. */
> ++	PSSCAN_ARGVN    = (1<<  16) * (ENABLE_KILLALL
> ++				|| ENABLE_PGREP || ENABLE_PKILL
> ++				|| ENABLE_PIDOF
> ++				|| ENABLE_SESTATUS
> ++				),
> + 	USE_SELINUX(PSSCAN_CONTEXT = 1<<  17,)
> + 	PSSCAN_START_TIME = 1<<  18,
> + 	PSSCAN_CPU      = 1<<  19,
> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch
> new file mode 100644
> index 0000000..281d457
> --- /dev/null
> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch
> @@ -0,0 +1,21 @@
> +diff -urpN busybox-1.13.2/coreutils/printf.c busybox-1.13.2-printf/coreutils/printf.c
> +--- busybox-1.13.2/coreutils/printf.c	2008-12-31 04:06:45.000000000 +0100
> ++++ busybox-1.13.2-printf/coreutils/printf.c	2009-03-03 15:13:12.000000000 +0100
> +@@ -139,14 +139,14 @@ static void print_direc(char *format, un
> + 	char saved;
> + 	char *have_prec, *have_width;
> +
> ++	saved = format[fmt_length];
> ++	format[fmt_length] = '\0';
> ++
> + 	have_prec = strstr(format, ".*");
> + 	have_width = strchr(format, '*');
> + 	if (have_width - 1 == have_prec)
> + 		have_width = NULL;
> +
> +-	saved = format[fmt_length];
> +-	format[fmt_length] = '\0';
> +-
> + 	switch (format[fmt_length - 1]) {
> + 	case 'c':
> + 		printf(format, *argument);
> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch
> new file mode 100644
> index 0000000..1c24cdc
> --- /dev/null
> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch
> @@ -0,0 +1,30 @@
> +diff -urpN busybox-1.13.2/sysklogd/syslogd.c busybox-1.13.2-syslogd/sysklogd/syslogd.c
> +--- busybox-1.13.2/sysklogd/syslogd.c	2008-11-09 18:28:03.000000000 +0100
> ++++ busybox-1.13.2-syslogd/sysklogd/syslogd.c	2009-03-08 02:03:24.000000000 +0100
> +@@ -301,17 +301,23 @@ static void log_locally(time_t now, char
> + 	}
> + #endif
> + 	if (G.logFD>= 0) {
> ++		/* Reopen log file every second. This allows admin
> ++		 * to delete the file and not worry about restarting us.
> ++		 * This costs almost nothing since it happens
> ++		 * _at most_ once a second.
> ++		 */
> + 		if (!now)
> + 			now = time(NULL);
> + 		if (G.last_log_time != now) {
> +-			G.last_log_time = now; /* reopen log file every second */
> ++			G.last_log_time = now;
> + 			close(G.logFD);
> + 			goto reopen;
> + 		}
> + 	} else {
> +  reopen:
> +-		G.logFD = device_open(G.logFilePath, O_WRONLY | O_CREAT
> +-					| O_NOCTTY | O_APPEND | O_NONBLOCK);
> ++		G.logFD = open(G.logFilePath, O_WRONLY | O_CREAT
> ++					| O_NOCTTY | O_APPEND | O_NONBLOCK,
> ++					0666);
> + 		if (G.logFD<  0) {
> + 			/* cannot open logfile? - print to /dev/console then */
> + 			int fd = device_open(DEV_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK);
> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch
> new file mode 100644
> index 0000000..25ee861
> --- /dev/null
> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch
> @@ -0,0 +1,12 @@
> +diff -urpN busybox-1.13.2/procps/top.c busybox-1.13.2-top24/procps/top.c
> +--- busybox-1.13.2/procps/top.c	2008-11-09 18:28:20.000000000 +0100
> ++++ busybox-1.13.2-top24/procps/top.c	2009-03-02 22:24:31.000000000 +0100
> +@@ -200,7 +200,7 @@ static NOINLINE int read_cpu_jiffy(FILE
> + 			&p_jif->usr,&p_jif->nic,&p_jif->sys,&p_jif->idle,
> + 			&p_jif->iowait,&p_jif->irq,&p_jif->softirq,
> + 			&p_jif->steal);
> +-	if (ret>  4) {
> ++	if (ret>= 4) {
> + 		p_jif->total = p_jif->usr + p_jif->nic + p_jif->sys + p_jif->idle
> + 			+ p_jif->iowait + p_jif->irq + p_jif->softirq + p_jif->steal;
> + 		/* procps 2.x does not count iowait as busy time */
> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch
> new file mode 100644
> index 0000000..6b3f713
> --- /dev/null
> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch
> @@ -0,0 +1,12 @@
> +diff -urpN busybox-1.13.2/archival/unzip.c busybox-1.13.2-unzip/archival/unzip.c
> +--- busybox-1.13.2/archival/unzip.c	2008-11-09 18:28:02.000000000 +0100
> ++++ busybox-1.13.2-unzip/archival/unzip.c	2009-02-26 12:17:21.000000000 +0100
> +@@ -140,7 +140,7 @@ struct BUG_cde_header_must_be_16_bytes {
> + };
> +
> + #define FIX_ENDIANNESS_CDE(cde_header) do { \
> +-	(cde_header).formatted.cds_offset = SWAP_LE16((cde_header).formatted.cds_offset); \
> ++	(cde_header).formatted.cds_offset = SWAP_LE32((cde_header).formatted.cds_offset); \
> + } while (0)
> +
> + enum { zip_fd = 3 };
> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch
> new file mode 100644
> index 0000000..862467f
> --- /dev/null
> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch
> @@ -0,0 +1,41 @@
> +diff -urpN busybox-1.13.2/networking/wget.c busybox-1.13.2-wget/networking/wget.c
> +--- busybox-1.13.2/networking/wget.c	2008-11-09 18:27:59.000000000 +0100
> ++++ busybox-1.13.2-wget/networking/wget.c	2009-03-02 16:07:12.000000000 +0100
> +@@ -417,15 +417,17 @@ int wget_main(int argc UNUSED_PARAM, cha
> + 		KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location
> + 	};
> + 	enum {
> +-		WGET_OPT_CONTINUE   = 0x1,
> +-		WGET_OPT_SPIDER	    = 0x2,
> +-		WGET_OPT_QUIET      = 0x4,
> +-		WGET_OPT_OUTNAME    = 0x8,
> +-		WGET_OPT_PREFIX     = 0x10,
> +-		WGET_OPT_PROXY      = 0x20,
> +-		WGET_OPT_USER_AGENT = 0x40,
> +-		WGET_OPT_PASSIVE    = 0x80,
> +-		WGET_OPT_HEADER     = 0x100,
> ++		WGET_OPT_CONTINUE   = (1<<  0),
> ++		WGET_OPT_SPIDER	    = (1<<  1),
> ++		WGET_OPT_QUIET      = (1<<  2),
> ++		WGET_OPT_OUTNAME    = (1<<  3),
> ++		WGET_OPT_PREFIX     = (1<<  4),
> ++		WGET_OPT_PROXY      = (1<<  5),
> ++		WGET_OPT_USER_AGENT = (1<<  6),
> ++		WGET_OPT_RETRIES    = (1<<  7),
> ++		WGET_OPT_NETWORK_READ_TIMEOUT = (1<<  8),
> ++		WGET_OPT_PASSIVE    = (1<<  9),
> ++		WGET_OPT_HEADER     = (1<<  10),
> + 	};
> + #if ENABLE_FEATURE_WGET_LONG_OPTIONS
> + 	static const char wget_longopts[] ALIGN1 =
> +@@ -437,6 +439,10 @@ int wget_main(int argc UNUSED_PARAM, cha
> + 		"directory-prefix\0" Required_argument "P"
> + 		"proxy\0"            Required_argument "Y"
> + 		"user-agent\0"       Required_argument "U"
> ++		/* Ignored: */
> ++		// "tries\0"            Required_argument "t"
> ++		// "timeout\0"          Required_argument "T"
> ++		/* Ignored (we always use PASV): */
> + 		"passive-ftp\0"      No_argument       "\xff"
> + 		"header\0"           Required_argument "\xfe"
> + 		;
> diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb
> index 8ecbc1e..602e782 100644
> --- a/recipes/busybox/busybox_1.13.2.bb
> +++ b/recipes/busybox/busybox_1.13.2.bb
> @@ -1,13 +1,20 @@
>   require busybox.inc
> -PR = "r17"
> +PR = "r18"
>
>   SRC_URI = "\
>     http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
> +  file://busybox-1.13.2-awk.patch;patch=1 \
>     file://busybox-1.13.2-depmod.patch;patch=1 \
>     file://busybox-1.13.2-init.patch;patch=1 \
> +  file://busybox-1.13.2-killall.patch;patch=1 \
>     file://busybox-1.13.2-mdev.patch;patch=1 \
>     file://busybox-1.13.2-modprobe.patch;patch=1 \
> +  file://busybox-1.13.2-printf.patch;patch=1 \
> +  file://busybox-1.13.2-syslogd.patch;patch=1 \
>     file://busybox-1.13.2-tar.patch;patch=1 \
> +  file://busybox-1.13.2-top24.patch;patch=1 \
> +  file://busybox-1.13.2-unzip.patch;patch=1 \
> +  file://busybox-1.13.2-wget.patch;patch=1 \
>     \
>     file://udhcpscript.patch;patch=1 \
>     file://udhcpc-fix-nfsroot.patch;patch=1 \

Re: [STABLE][STABLE][PATCH 1/1] busybox 1.13.2: Add more upstream patches, bump PR

[Denys Dmytriyenko]

On Mon, Apr 20, 2009 at 06:32:40PM +0200, Koen Kooi wrote:
> Acked-by: Koen Kooi <koen@openembedded.org>

Acked-by: Denys Dmytriyenko <denis@denix.org>


> On 20-04-09 17:24, Marcin Juszkiewicz wrote:
>> From: Tom Rini<trini@kernel.crashing.org>
>>
>> This adds the awk, killall, printf, syslogd, top24, unzip and wget patches
>> from http://busybox.net/downloads/fixes-1.13.2/
>> ---
>>   .../busybox-1.13.2/busybox-1.13.2-awk.patch        |   46 
>> ++++++++++++++++++++
>>   .../busybox-1.13.2/busybox-1.13.2-killall.patch    |   17 +++++++
>>   .../busybox-1.13.2/busybox-1.13.2-printf.patch     |   21 +++++++++
>>   .../busybox-1.13.2/busybox-1.13.2-syslogd.patch    |   30 +++++++++++++
>>   .../busybox-1.13.2/busybox-1.13.2-top24.patch      |   12 +++++
>>   .../busybox-1.13.2/busybox-1.13.2-unzip.patch      |   12 +++++
>>   .../busybox-1.13.2/busybox-1.13.2-wget.patch       |   41 
>> +++++++++++++++++
>>   recipes/busybox/busybox_1.13.2.bb                  |    9 +++-
>>   8 files changed, 187 insertions(+), 1 deletions(-)
>>   create mode 100644 
>> recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch
>>   create mode 100644 
>> recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch
>>   create mode 100644 
>> recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch
>>   create mode 100644 
>> recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch
>>   create mode 100644 
>> recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch
>>   create mode 100644 
>> recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch
>>   create mode 100644 
>> recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch
>>
>> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch 
>> b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch
>> new file mode 100644
>> index 0000000..0a5e680
>> --- /dev/null
>> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch
>> @@ -0,0 +1,46 @@
>> +diff -urpN busybox-1.13.2/editors/awk.c busybox-1.13.2-awk/editors/awk.c
>> +--- busybox-1.13.2/editors/awk.c	2008-11-09 18:28:21.000000000 +0100
>> ++++ busybox-1.13.2-awk/editors/awk.c	2009-02-26 12:17:05.000000000 +0100
>> +@@ -392,8 +392,12 @@ static const uint16_t PRIMES[] ALIGN2 =
>> +
>> +
>> + /* Globals. Split in two parts so that first one is addressed
>> +- * with (mostly short) negative offsets */
>> ++ * with (mostly short) negative offsets.
>> ++ * NB: it's unsafe to put members of type "double"
>> ++ * into globals2 (gcc may fail to align them).
>> ++ */
>> + struct globals {
>> ++	double t_double;
>> + 	chain beginseq, mainseq, endseq;
>> + 	chain *seq;
>> + 	node *break_ptr, *continue_ptr;
>> +@@ -442,16 +446,16 @@ struct globals2 {
>> + 	tsplitter exec_builtin__tspl;
>> +
>> + 	/* biggest and least used members go last */
>> +-	double t_double;
>> + 	tsplitter fsplitter, rsplitter;
>> + };
>> + #define G1 (ptr_to_globals[-1])
>> + #define G (*(struct globals2 *)ptr_to_globals)
>> + /* For debug. nm --size-sort awk.o | grep -vi ' [tr] ' */
>> +-/* char G1size[sizeof(G1)]; - 0x6c */
>> +-/* char Gsize[sizeof(G)]; - 0x1cc */
>> ++/*char G1size[sizeof(G1)]; - 0x74 */
>> ++/*char Gsize[sizeof(G)]; - 0x1c4 */
>> + /* Trying to keep most of members accessible with short offsets: */
>> +-/* char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */
>> ++/*char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */
>> ++#define t_double     (G1.t_double    )
>> + #define beginseq     (G1.beginseq    )
>> + #define mainseq      (G1.mainseq     )
>> + #define endseq       (G1.endseq      )
>> +@@ -479,7 +483,6 @@ struct globals2 {
>> + #define t_info       (G.t_info      )
>> + #define t_tclass     (G.t_tclass    )
>> + #define t_string     (G.t_string    )
>> +-#define t_double     (G.t_double    )
>> + #define t_lineno     (G.t_lineno    )
>> + #define t_rollback   (G.t_rollback  )
>> + #define intvar       (G.intvar      )
>> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch 
>> b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch
>> new file mode 100644
>> index 0000000..9524f52
>> --- /dev/null
>> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch
>> @@ -0,0 +1,17 @@
>> +--- busybox-1.13.2/include/libbb.h	Wed Dec 31 04:06:45 2008
>> ++++ busybox-1.13.2-killall/include/libbb.h	Sat Feb 14 02:41:18 2009
>> +@@ -1275,7 +1275,13 @@
>> + 	PSSCAN_UTIME    = 1<<  13,
>> + 	PSSCAN_TTY      = 1<<  14,
>> + 	PSSCAN_SMAPS	= (1<<  15) * ENABLE_FEATURE_TOPMEM,
>> +-	PSSCAN_ARGVN    = (1<<  16) * (ENABLE_PGREP || ENABLE_PKILL || 
>> ENABLE_PIDOF),
>> ++	/* NB: used by find_pid_by_name(). Any applet using it
>> ++	 * needs to be mentioned here. */
>> ++	PSSCAN_ARGVN    = (1<<  16) * (ENABLE_KILLALL
>> ++				|| ENABLE_PGREP || ENABLE_PKILL
>> ++				|| ENABLE_PIDOF
>> ++				|| ENABLE_SESTATUS
>> ++				),
>> + 	USE_SELINUX(PSSCAN_CONTEXT = 1<<  17,)
>> + 	PSSCAN_START_TIME = 1<<  18,
>> + 	PSSCAN_CPU      = 1<<  19,
>> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch 
>> b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch
>> new file mode 100644
>> index 0000000..281d457
>> --- /dev/null
>> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch
>> @@ -0,0 +1,21 @@
>> +diff -urpN busybox-1.13.2/coreutils/printf.c 
>> busybox-1.13.2-printf/coreutils/printf.c
>> +--- busybox-1.13.2/coreutils/printf.c	2008-12-31 04:06:45.000000000 +0100
>> ++++ busybox-1.13.2-printf/coreutils/printf.c	2009-03-03 
>> 15:13:12.000000000 +0100
>> +@@ -139,14 +139,14 @@ static void print_direc(char *format, un
>> + 	char saved;
>> + 	char *have_prec, *have_width;
>> +
>> ++	saved = format[fmt_length];
>> ++	format[fmt_length] = '\0';
>> ++
>> + 	have_prec = strstr(format, ".*");
>> + 	have_width = strchr(format, '*');
>> + 	if (have_width - 1 == have_prec)
>> + 		have_width = NULL;
>> +
>> +-	saved = format[fmt_length];
>> +-	format[fmt_length] = '\0';
>> +-
>> + 	switch (format[fmt_length - 1]) {
>> + 	case 'c':
>> + 		printf(format, *argument);
>> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch 
>> b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch
>> new file mode 100644
>> index 0000000..1c24cdc
>> --- /dev/null
>> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch
>> @@ -0,0 +1,30 @@
>> +diff -urpN busybox-1.13.2/sysklogd/syslogd.c 
>> busybox-1.13.2-syslogd/sysklogd/syslogd.c
>> +--- busybox-1.13.2/sysklogd/syslogd.c	2008-11-09 18:28:03.000000000 +0100
>> ++++ busybox-1.13.2-syslogd/sysklogd/syslogd.c	2009-03-08 
>> 02:03:24.000000000 +0100
>> +@@ -301,17 +301,23 @@ static void log_locally(time_t now, char
>> + 	}
>> + #endif
>> + 	if (G.logFD>= 0) {
>> ++		/* Reopen log file every second. This allows admin
>> ++		 * to delete the file and not worry about restarting us.
>> ++		 * This costs almost nothing since it happens
>> ++		 * _at most_ once a second.
>> ++		 */
>> + 		if (!now)
>> + 			now = time(NULL);
>> + 		if (G.last_log_time != now) {
>> +-			G.last_log_time = now; /* reopen log file every second */
>> ++			G.last_log_time = now;
>> + 			close(G.logFD);
>> + 			goto reopen;
>> + 		}
>> + 	} else {
>> +  reopen:
>> +-		G.logFD = device_open(G.logFilePath, O_WRONLY | O_CREAT
>> +-					| O_NOCTTY | O_APPEND | O_NONBLOCK);
>> ++		G.logFD = open(G.logFilePath, O_WRONLY | O_CREAT
>> ++					| O_NOCTTY | O_APPEND | O_NONBLOCK,
>> ++					0666);
>> + 		if (G.logFD<  0) {
>> + 			/* cannot open logfile? - print to /dev/console then */
>> + 			int fd = device_open(DEV_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK);
>> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch 
>> b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch
>> new file mode 100644
>> index 0000000..25ee861
>> --- /dev/null
>> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch
>> @@ -0,0 +1,12 @@
>> +diff -urpN busybox-1.13.2/procps/top.c busybox-1.13.2-top24/procps/top.c
>> +--- busybox-1.13.2/procps/top.c	2008-11-09 18:28:20.000000000 +0100
>> ++++ busybox-1.13.2-top24/procps/top.c	2009-03-02 22:24:31.000000000 +0100
>> +@@ -200,7 +200,7 @@ static NOINLINE int read_cpu_jiffy(FILE
>> + 			&p_jif->usr,&p_jif->nic,&p_jif->sys,&p_jif->idle,
>> + 			&p_jif->iowait,&p_jif->irq,&p_jif->softirq,
>> + 			&p_jif->steal);
>> +-	if (ret>  4) {
>> ++	if (ret>= 4) {
>> + 		p_jif->total = p_jif->usr + p_jif->nic + p_jif->sys + p_jif->idle
>> + 			+ p_jif->iowait + p_jif->irq + p_jif->softirq + p_jif->steal;
>> + 		/* procps 2.x does not count iowait as busy time */
>> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch 
>> b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch
>> new file mode 100644
>> index 0000000..6b3f713
>> --- /dev/null
>> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch
>> @@ -0,0 +1,12 @@
>> +diff -urpN busybox-1.13.2/archival/unzip.c 
>> busybox-1.13.2-unzip/archival/unzip.c
>> +--- busybox-1.13.2/archival/unzip.c	2008-11-09 18:28:02.000000000 +0100
>> ++++ busybox-1.13.2-unzip/archival/unzip.c	2009-02-26 12:17:21.000000000 
>> +0100
>> +@@ -140,7 +140,7 @@ struct BUG_cde_header_must_be_16_bytes {
>> + };
>> +
>> + #define FIX_ENDIANNESS_CDE(cde_header) do { \
>> +-	(cde_header).formatted.cds_offset = 
>> SWAP_LE16((cde_header).formatted.cds_offset); \
>> ++	(cde_header).formatted.cds_offset = 
>> SWAP_LE32((cde_header).formatted.cds_offset); \
>> + } while (0)
>> +
>> + enum { zip_fd = 3 };
>> diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch 
>> b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch
>> new file mode 100644
>> index 0000000..862467f
>> --- /dev/null
>> +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch
>> @@ -0,0 +1,41 @@
>> +diff -urpN busybox-1.13.2/networking/wget.c 
>> busybox-1.13.2-wget/networking/wget.c
>> +--- busybox-1.13.2/networking/wget.c	2008-11-09 18:27:59.000000000 +0100
>> ++++ busybox-1.13.2-wget/networking/wget.c	2009-03-02 16:07:12.000000000 
>> +0100
>> +@@ -417,15 +417,17 @@ int wget_main(int argc UNUSED_PARAM, cha
>> + 		KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, 
>> KEY_location
>> + 	};
>> + 	enum {
>> +-		WGET_OPT_CONTINUE   = 0x1,
>> +-		WGET_OPT_SPIDER	    = 0x2,
>> +-		WGET_OPT_QUIET      = 0x4,
>> +-		WGET_OPT_OUTNAME    = 0x8,
>> +-		WGET_OPT_PREFIX     = 0x10,
>> +-		WGET_OPT_PROXY      = 0x20,
>> +-		WGET_OPT_USER_AGENT = 0x40,
>> +-		WGET_OPT_PASSIVE    = 0x80,
>> +-		WGET_OPT_HEADER     = 0x100,
>> ++		WGET_OPT_CONTINUE   = (1<<  0),
>> ++		WGET_OPT_SPIDER	    = (1<<  1),
>> ++		WGET_OPT_QUIET      = (1<<  2),
>> ++		WGET_OPT_OUTNAME    = (1<<  3),
>> ++		WGET_OPT_PREFIX     = (1<<  4),
>> ++		WGET_OPT_PROXY      = (1<<  5),
>> ++		WGET_OPT_USER_AGENT = (1<<  6),
>> ++		WGET_OPT_RETRIES    = (1<<  7),
>> ++		WGET_OPT_NETWORK_READ_TIMEOUT = (1<<  8),
>> ++		WGET_OPT_PASSIVE    = (1<<  9),
>> ++		WGET_OPT_HEADER     = (1<<  10),
>> + 	};
>> + #if ENABLE_FEATURE_WGET_LONG_OPTIONS
>> + 	static const char wget_longopts[] ALIGN1 =
>> +@@ -437,6 +439,10 @@ int wget_main(int argc UNUSED_PARAM, cha
>> + 		"directory-prefix\0" Required_argument "P"
>> + 		"proxy\0"            Required_argument "Y"
>> + 		"user-agent\0"       Required_argument "U"
>> ++		/* Ignored: */
>> ++		// "tries\0"            Required_argument "t"
>> ++		// "timeout\0"          Required_argument "T"
>> ++		/* Ignored (we always use PASV): */
>> + 		"passive-ftp\0"      No_argument       "\xff"
>> + 		"header\0"           Required_argument "\xfe"
>> + 		;
>> diff --git a/recipes/busybox/busybox_1.13.2.bb 
>> b/recipes/busybox/busybox_1.13.2.bb
>> index 8ecbc1e..602e782 100644
>> --- a/recipes/busybox/busybox_1.13.2.bb
>> +++ b/recipes/busybox/busybox_1.13.2.bb
>> @@ -1,13 +1,20 @@
>>   require busybox.inc
>> -PR = "r17"
>> +PR = "r18"
>>
>>   SRC_URI = "\
>>     http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
>> +  file://busybox-1.13.2-awk.patch;patch=1 \
>>     file://busybox-1.13.2-depmod.patch;patch=1 \
>>     file://busybox-1.13.2-init.patch;patch=1 \
>> +  file://busybox-1.13.2-killall.patch;patch=1 \
>>     file://busybox-1.13.2-mdev.patch;patch=1 \
>>     file://busybox-1.13.2-modprobe.patch;patch=1 \
>> +  file://busybox-1.13.2-printf.patch;patch=1 \
>> +  file://busybox-1.13.2-syslogd.patch;patch=1 \
>>     file://busybox-1.13.2-tar.patch;patch=1 \
>> +  file://busybox-1.13.2-top24.patch;patch=1 \
>> +  file://busybox-1.13.2-unzip.patch;patch=1 \
>> +  file://busybox-1.13.2-wget.patch;patch=1 \
>>     \
>>     file://udhcpscript.patch;patch=1 \
>>     file://udhcpc-fix-nfsroot.patch;patch=1 \
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

[STABLE][PATCH 1/1] tracker: added libgnomecanvas to dependencies

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

---
 recipes/tracker/tracker_0.5.4.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/tracker/tracker_0.5.4.bb b/recipes/tracker/tracker_0.5.4.bb
index 4753280..e1a94b7 100644
--- a/recipes/tracker/tracker_0.5.4.bb
+++ b/recipes/tracker/tracker_0.5.4.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly."
 LICENSE = "GPLv2"
-DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf"
+DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf libgnomecanvas"
 
 PR = "r3"
 
-- 
1.6.2.3

Re: [STABLE][PATCH 1/1] tracker: added libgnomecanvas to dependencies

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>


On 20-04-09 17:24, Marcin Juszkiewicz wrote:
> From: Marcin Juszkiewicz<hrw@openembedded.org>
>
> ---
>   recipes/tracker/tracker_0.5.4.bb |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/recipes/tracker/tracker_0.5.4.bb b/recipes/tracker/tracker_0.5.4.bb
> index 4753280..e1a94b7 100644
> --- a/recipes/tracker/tracker_0.5.4.bb
> +++ b/recipes/tracker/tracker_0.5.4.bb
> @@ -1,6 +1,6 @@
>   DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly."
>   LICENSE = "GPLv2"
> -DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf"
> +DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf libgnomecanvas"
>
>   PR = "r3"
>

Re: [STABLE][PATCH 1/1] tracker: added libgnomecanvas to dependencies

[Tom Rini]

On Mon, Apr 20, 2009 at 06:32:52PM +0200, Koen Kooi wrote:

> Acked-by: Koen Kooi <koen@openembedded.org>

Acked-by: Tom Rini <trini@embeddedalley.com>

>
>
> On 20-04-09 17:24, Marcin Juszkiewicz wrote:
>> From: Marcin Juszkiewicz<hrw@openembedded.org>
>>
>> ---
>>   recipes/tracker/tracker_0.5.4.bb |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/recipes/tracker/tracker_0.5.4.bb b/recipes/tracker/tracker_0.5.4.bb
>> index 4753280..e1a94b7 100644
>> --- a/recipes/tracker/tracker_0.5.4.bb
>> +++ b/recipes/tracker/tracker_0.5.4.bb
>> @@ -1,6 +1,6 @@
>>   DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly."
>>   LICENSE = "GPLv2"
>> -DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf"
>> +DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf libgnomecanvas"
>>
>>   PR = "r3"
>>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Tom Rini

[STABLE][PATCH 1/1] e2fsprogs_1.41.4.bb : remove bogus override of do_configure which breaks avr32 compile. Did a simple forward port of mkinstalldirs.patch that fixes the problem.

[Marcin Juszkiewicz]

From: Graeme Gregory <dp@xora.org.uk>

---
 .../e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch |  289 ++++++++++++++++++++
 recipes/e2fsprogs/e2fsprogs_1.41.4.bb              |   11 +-
 2 files changed, 291 insertions(+), 9 deletions(-)
 create mode 100644 recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch

diff --git a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
new file mode 100644
index 0000000..759e84e
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
@@ -0,0 +1,289 @@
+This patch is based on the following:
+
+http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch
+
+Index: e2fsprogs-1.41.4/configure.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/configure.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/configure.in	2009-04-09 21:19:28.000000000 +0100
+@@ -577,6 +577,7 @@
+ fi
+ AC_SUBST(MAKEINFO)
+ AC_PROG_INSTALL
++AC_PROG_MKDIR_P
+ # See if we need a separate native compiler.
+ if test $cross_compiling = no; then
+   BUILD_CC="$CC"
+Index: e2fsprogs-1.41.4/debugfs/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/debugfs/Makefile.in	2008-06-18 04:53:42.000000000 +0100
++++ e2fsprogs-1.41.4/debugfs/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -47,8 +47,8 @@
+ 	@$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
+ 		$(DESTDIR)$(man8dir)
+ 
+ install: $(PROGS) $(MANPAGES) installdirs
+Index: e2fsprogs-1.41.4/doc/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/doc/Makefile.in	2008-05-26 00:52:27.000000000 +0100
++++ e2fsprogs-1.41.4/doc/Makefile.in	2009-04-09 21:20:09.000000000 +0100
+@@ -20,8 +20,8 @@
+ 
+ install-doc-libs: libext2fs.info libext2fs.dvi
+ 	@$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
+-	@echo "	MKINSTALLDIRS $(infodir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
++	@echo "	MKDIR_P $(infodir)"
++	@$(MKDIR_P) $(DESTDIR)$(infodir)
+ 	-@for i in libext2fs.info* ; do \
+ 		echo "	INSTALL_DATA $(infodir)/$$i" ; \
+ 		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
+Index: e2fsprogs-1.41.4/e2fsck/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in	2008-11-15 04:19:57.000000000 +0000
++++ e2fsprogs-1.41.4/e2fsck/Makefile.in	2009-04-09 21:20:44.000000000 +0100
+@@ -185,8 +185,8 @@
+ 	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
+ 		$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
+ 
+ install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
+Index: e2fsprogs-1.41.4/intl/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/intl/Makefile.in	2007-06-30 13:58:34.000000000 +0100
++++ e2fsprogs-1.41.4/intl/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -40,8 +40,8 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
++MKDIR_P = @MKDIR_P@
++mkdir_p = @MKDIR_P@
+ 
+ l = @INTL_LIBTOOL_SUFFIX_PREFIX@
+ 
+Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/blkid/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -142,8 +142,8 @@
+ 	@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/blkid"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/blkid"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
+ 
+ install:: all installdirs 
+Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/e2p/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -79,8 +79,8 @@
+ 	./tst_feature
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/e2p"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/e2p"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
+ 
+ install:: all installdirs 
+Index: e2fsprogs-1.41.4/lib/et/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/et/Makefile.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/et/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -74,8 +74,8 @@
+ 	$(TAGS) $(SRCS)
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
+ 		$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
+ 		$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
+Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -330,8 +330,8 @@
+ 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/ext2fs"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
+ 
+ install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
+Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/Makefile.elf-lib	2009-04-09 21:19:28.000000000 +0100
+@@ -33,8 +33,8 @@
+ 	@$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
+ 
+ installdirs-elf-lib::
+-	@echo "	MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
++	@echo "	MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
++	@$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ 		$(DESTDIR)$(libdir)
+ 
+ installdirs:: installdirs-elf-lib
+Index: e2fsprogs-1.41.4/lib/ss/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/ss/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -129,8 +129,8 @@
+ 	@cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
+ 		$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
+ 
+Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in	2008-02-19 04:33:10.000000000 +0000
++++ e2fsprogs-1.41.4/lib/uuid/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -126,8 +126,8 @@
+ 	@cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)  \
++	@echo "	MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)"
++	@$(MKDIR_P) $(DESTDIR)$(libdir)  \
+ 		$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
+ 		$(DESTDIR)$(libdir)/pkgconfig
+ 
+Index: e2fsprogs-1.41.4/MCONFIG.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/MCONFIG.in	2008-11-15 17:17:22.000000000 +0000
++++ e2fsprogs-1.41.4/MCONFIG.in	2009-04-09 21:19:28.000000000 +0100
+@@ -64,7 +64,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKDIR_P = @MKDIR_P@
+ 
+ #
+ # Library definitions
+Index: e2fsprogs-1.41.4/misc/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/misc/Makefile.in	2008-11-15 17:33:33.000000000 +0000
++++ e2fsprogs-1.41.4/misc/Makefile.in	2009-04-09 21:21:22.000000000 +0100
+@@ -366,8 +366,8 @@
+ 	@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
++	@echo "	MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
++	@$(MKDIR_P) $(DESTDIR)$(sbindir) \
+ 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
+ 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
+ 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
+Index: e2fsprogs-1.41.4/po/Makefile.in.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/po/Makefile.in.in	2007-06-30 13:58:34.000000000 +0100
++++ e2fsprogs-1.41.4/po/Makefile.in.in	2009-04-09 21:19:28.000000000 +0100
+@@ -26,11 +26,10 @@
+ datadir = @datadir@
+ localedir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/gettext/po
++mkdir_p = @MKDIR_P@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
+@@ -148,7 +147,7 @@
+ install-exec:
+ install-data: install-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ 	  for file in $(DISTFILES.common) Makevars.template; do \
+ 	    $(INSTALL_DATA) $(srcdir)/$$file \
+ 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+@@ -161,13 +160,13 @@
+ 	fi
+ install-data-no: all
+ install-data-yes: all
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
++	  $(mkdir_p) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+ 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+ 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+@@ -207,19 +206,19 @@
+ installdirs-exec:
+ installdirs-data: installdirs-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ 	else \
+ 	  : ; \
+ 	fi
+ installdirs-data-no:
+ installdirs-data-yes:
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
++	  $(mkdir_p) $(DESTDIR)$$dir; \
+ 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ 	    if test -n "$$lc"; then \
+ 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+Index: e2fsprogs-1.41.4/resize/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/resize/Makefile.in	2007-06-30 13:58:35.000000000 +0100
++++ e2fsprogs-1.41.4/resize/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -57,8 +57,8 @@
+ 	@$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) 
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
+ 		$(DESTDIR)$(man8dir)
+ 
+ install: $(PROGS) $(MANPAGES) installdirs
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
index dda4b81..177d9af 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
@@ -1,15 +1,8 @@
 require e2fsprogs.inc
 
-PR = "r1"
+SRC_URI += "file://mkinstalldirs.patch;patch=1"
 
-#SRC_URI += "file://no-hardlinks.patch;patch=1 \
-#	    file://mkinstalldirs.patch;patch=1 \
-#	   "
-
-do_configure() {
-	# avoid autoreconf
-	oe_runconf $@
-}
+PR = "r2"
 
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
-- 
1.6.2.3

Re: [STABLE][PATCH 1/1] e2fsprogs_1.41.4.bb : remove bogus override of do_configure which breaks avr32 compile. Did a simple forward port of mkinstalldirs.patch that fixes the problem.

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>


On 20-04-09 17:24, Marcin Juszkiewicz wrote:
> From: Graeme Gregory<dp@xora.org.uk>
>
> ---
>   .../e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch |  289 ++++++++++++++++++++
>   recipes/e2fsprogs/e2fsprogs_1.41.4.bb              |   11 +-
>   2 files changed, 291 insertions(+), 9 deletions(-)
>   create mode 100644 recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
>
> diff --git a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
> new file mode 100644
> index 0000000..759e84e
> --- /dev/null
> +++ b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
> @@ -0,0 +1,289 @@
> +This patch is based on the following:
> +
> +http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch
> +
> +Index: e2fsprogs-1.41.4/configure.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/configure.in	2008-10-07 15:22:39.000000000 +0100
> ++++ e2fsprogs-1.41.4/configure.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -577,6 +577,7 @@
> + fi
> + AC_SUBST(MAKEINFO)
> + AC_PROG_INSTALL
> ++AC_PROG_MKDIR_P
> + # See if we need a separate native compiler.
> + if test $cross_compiling = no; then
> +   BUILD_CC="$CC"
> +Index: e2fsprogs-1.41.4/debugfs/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/debugfs/Makefile.in	2008-06-18 04:53:42.000000000 +0100
> ++++ e2fsprogs-1.41.4/debugfs/Makefile.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -47,8 +47,8 @@
> + 	@$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
> +
> + installdirs:
> +-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
> ++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
> ++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
> + 		$(DESTDIR)$(man8dir)
> +
> + install: $(PROGS) $(MANPAGES) installdirs
> +Index: e2fsprogs-1.41.4/doc/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/doc/Makefile.in	2008-05-26 00:52:27.000000000 +0100
> ++++ e2fsprogs-1.41.4/doc/Makefile.in	2009-04-09 21:20:09.000000000 +0100
> +@@ -20,8 +20,8 @@
> +
> + install-doc-libs: libext2fs.info libext2fs.dvi
> + 	@$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
> +-	@echo "	MKINSTALLDIRS $(infodir)"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
> ++	@echo "	MKDIR_P $(infodir)"
> ++	@$(MKDIR_P) $(DESTDIR)$(infodir)
> + 	-@for i in libext2fs.info* ; do \
> + 		echo "	INSTALL_DATA $(infodir)/$$i" ; \
> + 		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
> +Index: e2fsprogs-1.41.4/e2fsck/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in	2008-11-15 04:19:57.000000000 +0000
> ++++ e2fsprogs-1.41.4/e2fsck/Makefile.in	2009-04-09 21:20:44.000000000 +0100
> +@@ -185,8 +185,8 @@
> + 	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
> +
> + installdirs:
> +-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
> ++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
> ++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
> + 		$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
> +
> + install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
> +Index: e2fsprogs-1.41.4/intl/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/intl/Makefile.in	2007-06-30 13:58:34.000000000 +0100
> ++++ e2fsprogs-1.41.4/intl/Makefile.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -40,8 +40,8 @@
> +
> + INSTALL = @INSTALL@
> + INSTALL_DATA = @INSTALL_DATA@
> +-MKINSTALLDIRS = @MKINSTALLDIRS@
> +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
> ++MKDIR_P = @MKDIR_P@
> ++mkdir_p = @MKDIR_P@
> +
> + l = @INTL_LIBTOOL_SUFFIX_PREFIX@
> +
> +Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in	2008-10-07 15:22:39.000000000 +0100
> ++++ e2fsprogs-1.41.4/lib/blkid/Makefile.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -142,8 +142,8 @@
> + 	@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
> +
> + installdirs::
> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/blkid"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
> ++	@echo "	MKDIR_P $(libdir) $(includedir)/blkid"
> ++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
> + 		$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
> +
> + install:: all installdirs
> +Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in	2008-10-07 15:22:39.000000000 +0100
> ++++ e2fsprogs-1.41.4/lib/e2p/Makefile.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -79,8 +79,8 @@
> + 	./tst_feature
> +
> + installdirs::
> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/e2p"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
> ++	@echo "	MKDIR_P $(libdir) $(includedir)/e2p"
> ++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
> + 		$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
> +
> + install:: all installdirs
> +Index: e2fsprogs-1.41.4/lib/et/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/lib/et/Makefile.in	2008-10-07 15:22:39.000000000 +0100
> ++++ e2fsprogs-1.41.4/lib/et/Makefile.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -74,8 +74,8 @@
> + 	$(TAGS) $(SRCS)
> +
> + installdirs::
> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
> ++	@echo "	MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
> ++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
> + 		$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
> + 		$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
> + 		$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
> +Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in	2008-10-07 15:22:39.000000000 +0100
> ++++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -330,8 +330,8 @@
> + 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum
> +
> + installdirs::
> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
> ++	@echo "	MKDIR_P $(libdir) $(includedir)/ext2fs"
> ++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
> + 		$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
> +
> + install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
> +Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib	2008-10-07 15:22:39.000000000 +0100
> ++++ e2fsprogs-1.41.4/lib/Makefile.elf-lib	2009-04-09 21:19:28.000000000 +0100
> +@@ -33,8 +33,8 @@
> + 	@$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
> +
> + installdirs-elf-lib::
> +-	@echo "	MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
> ++	@echo "	MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
> ++	@$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
> + 		$(DESTDIR)$(libdir)
> +
> + installdirs:: installdirs-elf-lib
> +Index: e2fsprogs-1.41.4/lib/ss/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in	2008-10-07 15:22:39.000000000 +0100
> ++++ e2fsprogs-1.41.4/lib/ss/Makefile.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -129,8 +129,8 @@
> + 	@cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
> +
> + installdirs::
> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
> ++	@echo "	MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
> ++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
> + 		$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
> + 		$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
> +
> +Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in	2008-02-19 04:33:10.000000000 +0000
> ++++ e2fsprogs-1.41.4/lib/uuid/Makefile.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -126,8 +126,8 @@
> + 	@cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
> +
> + installdirs::
> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)  \
> ++	@echo "	MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)"
> ++	@$(MKDIR_P) $(DESTDIR)$(libdir)  \
> + 		$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
> + 		$(DESTDIR)$(libdir)/pkgconfig
> +
> +Index: e2fsprogs-1.41.4/MCONFIG.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/MCONFIG.in	2008-11-15 17:17:22.000000000 +0000
> ++++ e2fsprogs-1.41.4/MCONFIG.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -64,7 +64,7 @@
> + INSTALL_PROGRAM = @INSTALL_PROGRAM@
> + INSTALL_DATA = @INSTALL_DATA@
> + INSTALL_SCRIPT = @INSTALL_SCRIPT@
> +-MKINSTALLDIRS = @MKINSTALLDIRS@
> ++MKDIR_P = @MKDIR_P@
> +
> + #
> + # Library definitions
> +Index: e2fsprogs-1.41.4/misc/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/misc/Makefile.in	2008-11-15 17:33:33.000000000 +0000
> ++++ e2fsprogs-1.41.4/misc/Makefile.in	2009-04-09 21:21:22.000000000 +0100
> +@@ -366,8 +366,8 @@
> + 	@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
> +
> + installdirs:
> +-	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
> ++	@echo "	MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
> ++	@$(MKDIR_P) $(DESTDIR)$(sbindir) \
> + 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
> + 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
> + 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
> +Index: e2fsprogs-1.41.4/po/Makefile.in.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/po/Makefile.in.in	2007-06-30 13:58:34.000000000 +0100
> ++++ e2fsprogs-1.41.4/po/Makefile.in.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -26,11 +26,10 @@
> + datadir = @datadir@
> + localedir = $(datadir)/locale
> + gettextsrcdir = $(datadir)/gettext/po
> ++mkdir_p = @MKDIR_P@
> +
> + INSTALL = @INSTALL@
> + INSTALL_DATA = @INSTALL_DATA@
> +-MKINSTALLDIRS = @MKINSTALLDIRS@
> +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
> +
> + GMSGFMT = @GMSGFMT@
> + MSGFMT = @MSGFMT@
> +@@ -148,7 +147,7 @@
> + install-exec:
> + install-data: install-data-@USE_NLS@
> + 	if test "$(PACKAGE)" = "gettext-tools"; then \
> +-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
> ++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
> + 	  for file in $(DISTFILES.common) Makevars.template; do \
> + 	    $(INSTALL_DATA) $(srcdir)/$$file \
> + 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
> +@@ -161,13 +160,13 @@
> + 	fi
> + install-data-no: all
> + install-data-yes: all
> +-	$(mkinstalldirs) $(DESTDIR)$(datadir)
> ++	$(mkdir_p) $(DESTDIR)$(datadir)
> + 	@catalogs='$(CATALOGS)'; \
> + 	for cat in $$catalogs; do \
> + 	  cat=`basename $$cat`; \
> + 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
> + 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
> +-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
> ++	  $(mkdir_p) $(DESTDIR)$$dir; \
> + 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
> + 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
> + 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
> +@@ -207,19 +206,19 @@
> + installdirs-exec:
> + installdirs-data: installdirs-data-@USE_NLS@
> + 	if test "$(PACKAGE)" = "gettext-tools"; then \
> +-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
> ++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
> + 	else \
> + 	  : ; \
> + 	fi
> + installdirs-data-no:
> + installdirs-data-yes:
> +-	$(mkinstalldirs) $(DESTDIR)$(datadir)
> ++	$(mkdir_p) $(DESTDIR)$(datadir)
> + 	@catalogs='$(CATALOGS)'; \
> + 	for cat in $$catalogs; do \
> + 	  cat=`basename $$cat`; \
> + 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
> + 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
> +-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
> ++	  $(mkdir_p) $(DESTDIR)$$dir; \
> + 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
> + 	    if test -n "$$lc"; then \
> + 	      if (cd $(DESTDIR)$(localedir)/$$lang&&  LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' ->  '>/dev/null; then \
> +Index: e2fsprogs-1.41.4/resize/Makefile.in
> +===================================================================
> +--- e2fsprogs-1.41.4.orig/resize/Makefile.in	2007-06-30 13:58:35.000000000 +0100
> ++++ e2fsprogs-1.41.4/resize/Makefile.in	2009-04-09 21:19:28.000000000 +0100
> +@@ -57,8 +57,8 @@
> + 	@$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
> +
> + installdirs:
> +-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
> ++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
> ++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
> + 		$(DESTDIR)$(man8dir)
> +
> + install: $(PROGS) $(MANPAGES) installdirs
> diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
> index dda4b81..177d9af 100644
> --- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
> +++ b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
> @@ -1,15 +1,8 @@
>   require e2fsprogs.inc
>
> -PR = "r1"
> +SRC_URI += "file://mkinstalldirs.patch;patch=1"
>
> -#SRC_URI += "file://no-hardlinks.patch;patch=1 \
> -#	    file://mkinstalldirs.patch;patch=1 \
> -#	   "
> -
> -do_configure() {
> -	# avoid autoreconf
> -	oe_runconf $@
> -}
> +PR = "r2"
>
>   do_compile_prepend () {
>   	find ./ -print|xargs chmod u=rwX

Re: [STABLE][PATCH 1/1] e2fsprogs_1.41.4.bb : remove bogus override of do_configure which breaks avr32 compile. Did a simple forward port of mkinstalldirs.patch that fixes the problem.

[Tom Rini]

On Mon, Apr 20, 2009 at 06:33:21PM +0200, Koen Kooi wrote:
> Acked-by: Koen Kooi <koen@openembedded.org>

Acked-by: Tom Rini <trini@embeddedalley.com>

>
>
> On 20-04-09 17:24, Marcin Juszkiewicz wrote:
>> From: Graeme Gregory<dp@xora.org.uk>
>>
>> ---
>>   .../e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch |  289 ++++++++++++++++++++
>>   recipes/e2fsprogs/e2fsprogs_1.41.4.bb              |   11 +-
>>   2 files changed, 291 insertions(+), 9 deletions(-)
>>   create mode 100644 recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
>>
>> diff --git a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
>> new file mode 100644
>> index 0000000..759e84e
>> --- /dev/null
>> +++ b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
>> @@ -0,0 +1,289 @@
>> +This patch is based on the following:
>> +
>> +http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch
>> +
>> +Index: e2fsprogs-1.41.4/configure.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/configure.in	2008-10-07 15:22:39.000000000 +0100
>> ++++ e2fsprogs-1.41.4/configure.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -577,6 +577,7 @@
>> + fi
>> + AC_SUBST(MAKEINFO)
>> + AC_PROG_INSTALL
>> ++AC_PROG_MKDIR_P
>> + # See if we need a separate native compiler.
>> + if test $cross_compiling = no; then
>> +   BUILD_CC="$CC"
>> +Index: e2fsprogs-1.41.4/debugfs/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/debugfs/Makefile.in	2008-06-18 04:53:42.000000000 +0100
>> ++++ e2fsprogs-1.41.4/debugfs/Makefile.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -47,8 +47,8 @@
>> + 	@$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
>> +
>> + installdirs:
>> +-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
>> ++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
>> ++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
>> + 		$(DESTDIR)$(man8dir)
>> +
>> + install: $(PROGS) $(MANPAGES) installdirs
>> +Index: e2fsprogs-1.41.4/doc/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/doc/Makefile.in	2008-05-26 00:52:27.000000000 +0100
>> ++++ e2fsprogs-1.41.4/doc/Makefile.in	2009-04-09 21:20:09.000000000 +0100
>> +@@ -20,8 +20,8 @@
>> +
>> + install-doc-libs: libext2fs.info libext2fs.dvi
>> + 	@$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
>> +-	@echo "	MKINSTALLDIRS $(infodir)"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
>> ++	@echo "	MKDIR_P $(infodir)"
>> ++	@$(MKDIR_P) $(DESTDIR)$(infodir)
>> + 	-@for i in libext2fs.info* ; do \
>> + 		echo "	INSTALL_DATA $(infodir)/$$i" ; \
>> + 		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
>> +Index: e2fsprogs-1.41.4/e2fsck/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in	2008-11-15 04:19:57.000000000 +0000
>> ++++ e2fsprogs-1.41.4/e2fsck/Makefile.in	2009-04-09 21:20:44.000000000 +0100
>> +@@ -185,8 +185,8 @@
>> + 	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
>> +
>> + installdirs:
>> +-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
>> ++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
>> ++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
>> + 		$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
>> +
>> + install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
>> +Index: e2fsprogs-1.41.4/intl/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/intl/Makefile.in	2007-06-30 13:58:34.000000000 +0100
>> ++++ e2fsprogs-1.41.4/intl/Makefile.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -40,8 +40,8 @@
>> +
>> + INSTALL = @INSTALL@
>> + INSTALL_DATA = @INSTALL_DATA@
>> +-MKINSTALLDIRS = @MKINSTALLDIRS@
>> +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
>> ++MKDIR_P = @MKDIR_P@
>> ++mkdir_p = @MKDIR_P@
>> +
>> + l = @INTL_LIBTOOL_SUFFIX_PREFIX@
>> +
>> +Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in	2008-10-07 15:22:39.000000000 +0100
>> ++++ e2fsprogs-1.41.4/lib/blkid/Makefile.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -142,8 +142,8 @@
>> + 	@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
>> +
>> + installdirs::
>> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/blkid"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
>> ++	@echo "	MKDIR_P $(libdir) $(includedir)/blkid"
>> ++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
>> + 		$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
>> +
>> + install:: all installdirs
>> +Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in	2008-10-07 15:22:39.000000000 +0100
>> ++++ e2fsprogs-1.41.4/lib/e2p/Makefile.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -79,8 +79,8 @@
>> + 	./tst_feature
>> +
>> + installdirs::
>> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/e2p"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
>> ++	@echo "	MKDIR_P $(libdir) $(includedir)/e2p"
>> ++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
>> + 		$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
>> +
>> + install:: all installdirs
>> +Index: e2fsprogs-1.41.4/lib/et/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/lib/et/Makefile.in	2008-10-07 15:22:39.000000000 +0100
>> ++++ e2fsprogs-1.41.4/lib/et/Makefile.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -74,8 +74,8 @@
>> + 	$(TAGS) $(SRCS)
>> +
>> + installdirs::
>> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
>> ++	@echo "	MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
>> ++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
>> + 		$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
>> + 		$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
>> + 		$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
>> +Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in	2008-10-07 15:22:39.000000000 +0100
>> ++++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -330,8 +330,8 @@
>> + 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum
>> +
>> + installdirs::
>> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
>> ++	@echo "	MKDIR_P $(libdir) $(includedir)/ext2fs"
>> ++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
>> + 		$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
>> +
>> + install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
>> +Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib	2008-10-07 15:22:39.000000000 +0100
>> ++++ e2fsprogs-1.41.4/lib/Makefile.elf-lib	2009-04-09 21:19:28.000000000 +0100
>> +@@ -33,8 +33,8 @@
>> + 	@$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
>> +
>> + installdirs-elf-lib::
>> +-	@echo "	MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
>> ++	@echo "	MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
>> ++	@$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
>> + 		$(DESTDIR)$(libdir)
>> +
>> + installdirs:: installdirs-elf-lib
>> +Index: e2fsprogs-1.41.4/lib/ss/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in	2008-10-07 15:22:39.000000000 +0100
>> ++++ e2fsprogs-1.41.4/lib/ss/Makefile.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -129,8 +129,8 @@
>> + 	@cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
>> +
>> + installdirs::
>> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
>> ++	@echo "	MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
>> ++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
>> + 		$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
>> + 		$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
>> +
>> +Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in	2008-02-19 04:33:10.000000000 +0000
>> ++++ e2fsprogs-1.41.4/lib/uuid/Makefile.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -126,8 +126,8 @@
>> + 	@cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
>> +
>> + installdirs::
>> +-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)  \
>> ++	@echo "	MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)"
>> ++	@$(MKDIR_P) $(DESTDIR)$(libdir)  \
>> + 		$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
>> + 		$(DESTDIR)$(libdir)/pkgconfig
>> +
>> +Index: e2fsprogs-1.41.4/MCONFIG.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/MCONFIG.in	2008-11-15 17:17:22.000000000 +0000
>> ++++ e2fsprogs-1.41.4/MCONFIG.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -64,7 +64,7 @@
>> + INSTALL_PROGRAM = @INSTALL_PROGRAM@
>> + INSTALL_DATA = @INSTALL_DATA@
>> + INSTALL_SCRIPT = @INSTALL_SCRIPT@
>> +-MKINSTALLDIRS = @MKINSTALLDIRS@
>> ++MKDIR_P = @MKDIR_P@
>> +
>> + #
>> + # Library definitions
>> +Index: e2fsprogs-1.41.4/misc/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/misc/Makefile.in	2008-11-15 17:33:33.000000000 +0000
>> ++++ e2fsprogs-1.41.4/misc/Makefile.in	2009-04-09 21:21:22.000000000 +0100
>> +@@ -366,8 +366,8 @@
>> + 	@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
>> +
>> + installdirs:
>> +-	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
>> ++	@echo "	MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
>> ++	@$(MKDIR_P) $(DESTDIR)$(sbindir) \
>> + 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
>> + 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
>> + 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
>> +Index: e2fsprogs-1.41.4/po/Makefile.in.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/po/Makefile.in.in	2007-06-30 13:58:34.000000000 +0100
>> ++++ e2fsprogs-1.41.4/po/Makefile.in.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -26,11 +26,10 @@
>> + datadir = @datadir@
>> + localedir = $(datadir)/locale
>> + gettextsrcdir = $(datadir)/gettext/po
>> ++mkdir_p = @MKDIR_P@
>> +
>> + INSTALL = @INSTALL@
>> + INSTALL_DATA = @INSTALL_DATA@
>> +-MKINSTALLDIRS = @MKINSTALLDIRS@
>> +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
>> +
>> + GMSGFMT = @GMSGFMT@
>> + MSGFMT = @MSGFMT@
>> +@@ -148,7 +147,7 @@
>> + install-exec:
>> + install-data: install-data-@USE_NLS@
>> + 	if test "$(PACKAGE)" = "gettext-tools"; then \
>> +-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
>> ++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
>> + 	  for file in $(DISTFILES.common) Makevars.template; do \
>> + 	    $(INSTALL_DATA) $(srcdir)/$$file \
>> + 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
>> +@@ -161,13 +160,13 @@
>> + 	fi
>> + install-data-no: all
>> + install-data-yes: all
>> +-	$(mkinstalldirs) $(DESTDIR)$(datadir)
>> ++	$(mkdir_p) $(DESTDIR)$(datadir)
>> + 	@catalogs='$(CATALOGS)'; \
>> + 	for cat in $$catalogs; do \
>> + 	  cat=`basename $$cat`; \
>> + 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
>> + 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
>> +-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
>> ++	  $(mkdir_p) $(DESTDIR)$$dir; \
>> + 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
>> + 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
>> + 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
>> +@@ -207,19 +206,19 @@
>> + installdirs-exec:
>> + installdirs-data: installdirs-data-@USE_NLS@
>> + 	if test "$(PACKAGE)" = "gettext-tools"; then \
>> +-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
>> ++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
>> + 	else \
>> + 	  : ; \
>> + 	fi
>> + installdirs-data-no:
>> + installdirs-data-yes:
>> +-	$(mkinstalldirs) $(DESTDIR)$(datadir)
>> ++	$(mkdir_p) $(DESTDIR)$(datadir)
>> + 	@catalogs='$(CATALOGS)'; \
>> + 	for cat in $$catalogs; do \
>> + 	  cat=`basename $$cat`; \
>> + 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
>> + 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
>> +-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
>> ++	  $(mkdir_p) $(DESTDIR)$$dir; \
>> + 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
>> + 	    if test -n "$$lc"; then \
>> + 	      if (cd $(DESTDIR)$(localedir)/$$lang&&  LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' ->  '>/dev/null; then \
>> +Index: e2fsprogs-1.41.4/resize/Makefile.in
>> +===================================================================
>> +--- e2fsprogs-1.41.4.orig/resize/Makefile.in	2007-06-30 13:58:35.000000000 +0100
>> ++++ e2fsprogs-1.41.4/resize/Makefile.in	2009-04-09 21:19:28.000000000 +0100
>> +@@ -57,8 +57,8 @@
>> + 	@$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
>> +
>> + installdirs:
>> +-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
>> +-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
>> ++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
>> ++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
>> + 		$(DESTDIR)$(man8dir)
>> +
>> + install: $(PROGS) $(MANPAGES) installdirs
>> diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
>> index dda4b81..177d9af 100644
>> --- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
>> +++ b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
>> @@ -1,15 +1,8 @@
>>   require e2fsprogs.inc
>>
>> -PR = "r1"
>> +SRC_URI += "file://mkinstalldirs.patch;patch=1"
>>
>> -#SRC_URI += "file://no-hardlinks.patch;patch=1 \
>> -#	    file://mkinstalldirs.patch;patch=1 \
>> -#	   "
>> -
>> -do_configure() {
>> -	# avoid autoreconf
>> -	oe_runconf $@
>> -}
>> +PR = "r2"
>>
>>   do_compile_prepend () {
>>   	find ./ -print|xargs chmod u=rwX
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Tom Rini

[STABLE][PATCH 1/1] e2fsprogs: fix compile to use 3 args so it works.

[Marcin Juszkiewicz]

From: Carsten Haitzler <raster@openmoko.org>

---
 .../e2fsprogs/e2fsprogs-1.38/file-open-mode.patch  |   11 +++++++++++
 recipes/e2fsprogs/e2fsprogs-native_1.38.bb         |    5 +++--
 recipes/e2fsprogs/e2fsprogs_1.38.bb                |    5 +++--
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch

diff --git a/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
new file mode 100644
index 0000000..97679d6
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
@@ -0,0 +1,11 @@
+--- e2fsprogs-1.38/lib/ext2fs/ismounted.c~	2005-06-06 06:05:22.000000000 +1000
++++ e2fsprogs-1.38/lib/ext2fs/ismounted.c	2009-04-03 15:07:35.000000000 +1100
+@@ -147,7 +147,7 @@
+ is_root:
+ #define TEST_FILE "/.ismount-test-file"		
+ 		*mount_flags |= EXT2_MF_ISROOT;
+-		fd = open(TEST_FILE, O_RDWR|O_CREAT);
++		fd = open(TEST_FILE, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+ 		if (fd < 0) {
+ 			if (errno == EROFS)
+ 				*mount_flags |= EXT2_MF_READONLY;
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
index 388c519..af49b0d 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -2,11 +2,12 @@ SECTION = "base"
 require e2fsprogs.inc
 inherit native
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1 \
 	    file://mkinstalldirs.patch;patch=1 \
-	   "
+            file://file-open-mode.patch;patch=1 \
+            "
 
 EXTRA_OECONF = ""
 
diff --git a/recipes/e2fsprogs/e2fsprogs_1.38.bb b/recipes/e2fsprogs/e2fsprogs_1.38.bb
index 5687556..8ec469a 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.38.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,10 +1,11 @@
 require e2fsprogs.inc
 
-PR = "r19"
+PR = "r20"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1 \
 	    file://mkinstalldirs.patch;patch=1 \
-	   "
+            file://file-open-mode.patch;patch=1 \
+           "
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
-- 
1.6.2.3

Re: [STABLE][PATCH 1/1] e2fsprogs: fix compile to use 3 args so it works.

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>


On 20-04-09 17:24, Marcin Juszkiewicz wrote:
> From: Carsten Haitzler<raster@openmoko.org>
>
> ---
>   .../e2fsprogs/e2fsprogs-1.38/file-open-mode.patch  |   11 +++++++++++
>   recipes/e2fsprogs/e2fsprogs-native_1.38.bb         |    5 +++--
>   recipes/e2fsprogs/e2fsprogs_1.38.bb                |    5 +++--
>   3 files changed, 17 insertions(+), 4 deletions(-)
>   create mode 100644 recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
>
> diff --git a/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
> new file mode 100644
> index 0000000..97679d6
> --- /dev/null
> +++ b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
> @@ -0,0 +1,11 @@
> +--- e2fsprogs-1.38/lib/ext2fs/ismounted.c~	2005-06-06 06:05:22.000000000 +1000
> ++++ e2fsprogs-1.38/lib/ext2fs/ismounted.c	2009-04-03 15:07:35.000000000 +1100
> +@@ -147,7 +147,7 @@
> + is_root:
> + #define TEST_FILE "/.ismount-test-file"		
> + 		*mount_flags |= EXT2_MF_ISROOT;
> +-		fd = open(TEST_FILE, O_RDWR|O_CREAT);
> ++		fd = open(TEST_FILE, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
> + 		if (fd<  0) {
> + 			if (errno == EROFS)
> + 				*mount_flags |= EXT2_MF_READONLY;
> diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
> index 388c519..af49b0d 100644
> --- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
> +++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
> @@ -2,11 +2,12 @@ SECTION = "base"
>   require e2fsprogs.inc
>   inherit native
>
> -PR = "r2"
> +PR = "r3"
>
>   SRC_URI += "file://no-hardlinks.patch;patch=1 \
>   	    file://mkinstalldirs.patch;patch=1 \
> -	   "
> +            file://file-open-mode.patch;patch=1 \
> +            "
>
>   EXTRA_OECONF = ""
>
> diff --git a/recipes/e2fsprogs/e2fsprogs_1.38.bb b/recipes/e2fsprogs/e2fsprogs_1.38.bb
> index 5687556..8ec469a 100644
> --- a/recipes/e2fsprogs/e2fsprogs_1.38.bb
> +++ b/recipes/e2fsprogs/e2fsprogs_1.38.bb
> @@ -1,10 +1,11 @@
>   require e2fsprogs.inc
>
> -PR = "r19"
> +PR = "r20"
>
>   SRC_URI += "file://no-hardlinks.patch;patch=1 \
>   	    file://mkinstalldirs.patch;patch=1 \
> -	   "
> +            file://file-open-mode.patch;patch=1 \
> +           "
>
>   TARGET_CC_ARCH += "${LDFLAGS}"
>

Re: [STABLE][PATCH 1/1] e2fsprogs: fix compile to use 3 args so it works.

[Tom Rini]

On Mon, Apr 20, 2009 at 06:33:30PM +0200, Koen Kooi wrote:
> Acked-by: Koen Kooi <koen@openembedded.org>

Acked-by: Tom Rini <trini@embeddedalley.com>

>
>
> On 20-04-09 17:24, Marcin Juszkiewicz wrote:
>> From: Carsten Haitzler<raster@openmoko.org>
>>
>> ---
>>   .../e2fsprogs/e2fsprogs-1.38/file-open-mode.patch  |   11 +++++++++++
>>   recipes/e2fsprogs/e2fsprogs-native_1.38.bb         |    5 +++--
>>   recipes/e2fsprogs/e2fsprogs_1.38.bb                |    5 +++--
>>   3 files changed, 17 insertions(+), 4 deletions(-)
>>   create mode 100644 recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
>>
>> diff --git a/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
>> new file mode 100644
>> index 0000000..97679d6
>> --- /dev/null
>> +++ b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
>> @@ -0,0 +1,11 @@
>> +--- e2fsprogs-1.38/lib/ext2fs/ismounted.c~	2005-06-06 06:05:22.000000000 +1000
>> ++++ e2fsprogs-1.38/lib/ext2fs/ismounted.c	2009-04-03 15:07:35.000000000 +1100
>> +@@ -147,7 +147,7 @@
>> + is_root:
>> + #define TEST_FILE "/.ismount-test-file"		
>> + 		*mount_flags |= EXT2_MF_ISROOT;
>> +-		fd = open(TEST_FILE, O_RDWR|O_CREAT);
>> ++		fd = open(TEST_FILE, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
>> + 		if (fd<  0) {
>> + 			if (errno == EROFS)
>> + 				*mount_flags |= EXT2_MF_READONLY;
>> diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
>> index 388c519..af49b0d 100644
>> --- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
>> +++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
>> @@ -2,11 +2,12 @@ SECTION = "base"
>>   require e2fsprogs.inc
>>   inherit native
>>
>> -PR = "r2"
>> +PR = "r3"
>>
>>   SRC_URI += "file://no-hardlinks.patch;patch=1 \
>>   	    file://mkinstalldirs.patch;patch=1 \
>> -	   "
>> +            file://file-open-mode.patch;patch=1 \
>> +            "
>>
>>   EXTRA_OECONF = ""
>>
>> diff --git a/recipes/e2fsprogs/e2fsprogs_1.38.bb b/recipes/e2fsprogs/e2fsprogs_1.38.bb
>> index 5687556..8ec469a 100644
>> --- a/recipes/e2fsprogs/e2fsprogs_1.38.bb
>> +++ b/recipes/e2fsprogs/e2fsprogs_1.38.bb
>> @@ -1,10 +1,11 @@
>>   require e2fsprogs.inc
>>
>> -PR = "r19"
>> +PR = "r20"
>>
>>   SRC_URI += "file://no-hardlinks.patch;patch=1 \
>>   	    file://mkinstalldirs.patch;patch=1 \
>> -	   "
>> +            file://file-open-mode.patch;patch=1 \
>> +           "
>>
>>   TARGET_CC_ARCH += "${LDFLAGS}"
>>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Tom Rini

[STABLE][PATCH 1/1] e2fsprogs 1.41.4: depends on gettext-native, due to the removal of do_configure

[Marcin Juszkiewicz]

From: Denys Dmytriyenko <denis@denix.org>

---
 recipes/e2fsprogs/e2fsprogs_1.41.4.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
index 177d9af..c2b9232 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
@@ -2,7 +2,9 @@ require e2fsprogs.inc
 
 SRC_URI += "file://mkinstalldirs.patch;patch=1"
 
-PR = "r2"
+DEPENDS += "gettext-native"
+
+PR = "r3"
 
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
-- 
1.6.2.3

Re: [STABLE][PATCH 1/1] e2fsprogs 1.41.4: depends on gettext-native, due to the removal of do_configure

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>


On 20-04-09 17:24, Marcin Juszkiewicz wrote:
> From: Denys Dmytriyenko<denis@denix.org>
>
> ---
>   recipes/e2fsprogs/e2fsprogs_1.41.4.bb |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
> index 177d9af..c2b9232 100644
> --- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
> +++ b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
> @@ -2,7 +2,9 @@ require e2fsprogs.inc
>
>   SRC_URI += "file://mkinstalldirs.patch;patch=1"
>
> -PR = "r2"
> +DEPENDS += "gettext-native"
> +
> +PR = "r3"
>
>   do_compile_prepend () {
>   	find ./ -print|xargs chmod u=rwX

Re: [STABLE][PATCH 1/1] e2fsprogs 1.41.4: depends on gettext-native, due to the removal of do_configure

[Denys Dmytriyenko]

On Mon, Apr 20, 2009 at 06:33:38PM +0200, Koen Kooi wrote:
> Acked-by: Koen Kooi <koen@openembedded.org>
>
>
> On 20-04-09 17:24, Marcin Juszkiewicz wrote:
>> From: Denys Dmytriyenko<denis@denix.org>
>>
>> ---
>>   recipes/e2fsprogs/e2fsprogs_1.41.4.bb |    4 +++-
>>   1 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb 
>> b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
>> index 177d9af..c2b9232 100644
>> --- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
>> +++ b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
>> @@ -2,7 +2,9 @@ require e2fsprogs.inc
>>
>>   SRC_URI += "file://mkinstalldirs.patch;patch=1"
>>
>> -PR = "r2"
>> +DEPENDS += "gettext-native"

I was told inherit gettext is better than just DEPENDS += "gettext-native"
Should I fix it it .dev first?

>> +PR = "r3"
>>
>>   do_compile_prepend () {
>>   	find ./ -print|xargs chmod u=rwX
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

[STABLE][PATCH 1/1] util-linux-ng: Fixed dangling symlinks.

[Marcin Juszkiewicz]

From: Leon Woestenberg <leon@sidebranch.com>

---
 recipes/util-linux-ng/util-linux-ng.inc       |   19 ++++++++-----------
 recipes/util-linux-ng/util-linux-ng_2.13.1.bb |    2 +-
 recipes/util-linux-ng/util-linux-ng_2.14.bb   |    2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 443adf2..dda9792 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -5,14 +5,11 @@ DEPENDS = "udev zlib ncurses e2fsprogs-libs"
 
 inherit autotools
 
-# I'm finishing this recipe during the 2.13.1 candidate release cycle
-# @todo Remove $RC later. See if patches are needed. Move files from /usr/*.
-# --  Leon 'likewise' Woestenberg
-
-#RC="-rc2"
-RC=""
 DEFAULT_PREFERENCE = "-1"
 
+# allows for a release candidate
+RC ?= ""
+
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2"
 
 PACKAGES =+ "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-swaponoff util-linux-ng-losetup util-linux-ng-umount util-linux-ng-mount util-linux-ng-readprofile "
@@ -114,11 +111,11 @@ do_install () {
 	install -d ${D}${sysconfdir}/default/
 	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
 
-	ln -sf ${base_sbindir}/swapon ${D}${base_sbindir}/swapoff.${PN}
-	ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/reboot.${PN}
-	ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/halt.${PN}
-	ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/fastboot
-	ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/fasthalt
+	ln -sf ${sbindir}/swapon ${D}${sbindir}/swapoff.${PN}
+	ln -sf ${sbindir}/shutdown ${D}${sbindir}/reboot.${PN}
+	ln -sf ${sbindir}/shutdown ${D}${sbindir}/halt.${PN}
+	ln -sf ${sbindir}/shutdown ${D}${sbindir}/fastboot
+	ln -sf ${sbindir}/shutdown ${D}${sbindir}/fasthalt
 }
 
 pkg_postinst_${PN} () {
diff --git a/recipes/util-linux-ng/util-linux-ng_2.13.1.bb b/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
index c10792e..946147d 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
@@ -4,4 +4,4 @@ require util-linux-ng.inc
 #SRC_URI += "file://glibc-fix.patch;patch=1"
 #SRC_URI += "file://glibc-umount2.patch;patch=1"
 
-PR = "r0"
+PR = "r1"
diff --git a/recipes/util-linux-ng/util-linux-ng_2.14.bb b/recipes/util-linux-ng/util-linux-ng_2.14.bb
index 587eb97..fdd911a 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.14.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.14.bb
@@ -1,6 +1,6 @@
 require util-linux-ng.inc
 
-PR = "r4"
+PR = "r5"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.14', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 SRC_URI += "file://util-linux-ng-uclibc-versionsort.patch;patch=1 \
-- 
1.6.2.3

Re: [STABLE][PATCH 1/1] util-linux-ng: Fixed dangling symlinks.

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>

On 20-04-09 17:24, Marcin Juszkiewicz wrote:
> From: Leon Woestenberg<leon@sidebranch.com>
>
> ---
>   recipes/util-linux-ng/util-linux-ng.inc       |   19 ++++++++-----------
>   recipes/util-linux-ng/util-linux-ng_2.13.1.bb |    2 +-
>   recipes/util-linux-ng/util-linux-ng_2.14.bb   |    2 +-
>   3 files changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
> index 443adf2..dda9792 100644
> --- a/recipes/util-linux-ng/util-linux-ng.inc
> +++ b/recipes/util-linux-ng/util-linux-ng.inc
> @@ -5,14 +5,11 @@ DEPENDS = "udev zlib ncurses e2fsprogs-libs"
>
>   inherit autotools
>
> -# I'm finishing this recipe during the 2.13.1 candidate release cycle
> -# @todo Remove $RC later. See if patches are needed. Move files from /usr/*.
> -# --  Leon 'likewise' Woestenberg
> -
> -#RC="-rc2"
> -RC=""
>   DEFAULT_PREFERENCE = "-1"
>
> +# allows for a release candidate
> +RC ?= ""
> +
>   SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2"
>
>   PACKAGES =+ "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-swaponoff util-linux-ng-losetup util-linux-ng-umount util-linux-ng-mount util-linux-ng-readprofile "
> @@ -114,11 +111,11 @@ do_install () {
>   	install -d ${D}${sysconfdir}/default/
>   	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"'>  ${D}${sysconfdir}/default/mountall
>
> -	ln -sf ${base_sbindir}/swapon ${D}${base_sbindir}/swapoff.${PN}
> -	ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/reboot.${PN}
> -	ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/halt.${PN}
> -	ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/fastboot
> -	ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/fasthalt
> +	ln -sf ${sbindir}/swapon ${D}${sbindir}/swapoff.${PN}
> +	ln -sf ${sbindir}/shutdown ${D}${sbindir}/reboot.${PN}
> +	ln -sf ${sbindir}/shutdown ${D}${sbindir}/halt.${PN}
> +	ln -sf ${sbindir}/shutdown ${D}${sbindir}/fastboot
> +	ln -sf ${sbindir}/shutdown ${D}${sbindir}/fasthalt
>   }
>
>   pkg_postinst_${PN} () {
> diff --git a/recipes/util-linux-ng/util-linux-ng_2.13.1.bb b/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
> index c10792e..946147d 100644
> --- a/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
> +++ b/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
> @@ -4,4 +4,4 @@ require util-linux-ng.inc
>   #SRC_URI += "file://glibc-fix.patch;patch=1"
>   #SRC_URI += "file://glibc-umount2.patch;patch=1"
>
> -PR = "r0"
> +PR = "r1"
> diff --git a/recipes/util-linux-ng/util-linux-ng_2.14.bb b/recipes/util-linux-ng/util-linux-ng_2.14.bb
> index 587eb97..fdd911a 100644
> --- a/recipes/util-linux-ng/util-linux-ng_2.14.bb
> +++ b/recipes/util-linux-ng/util-linux-ng_2.14.bb
> @@ -1,6 +1,6 @@
>   require util-linux-ng.inc
>
> -PR = "r4"
> +PR = "r5"
>   FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.14', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
>
>   SRC_URI += "file://util-linux-ng-uclibc-versionsort.patch;patch=1 \

Re: [STABLE][PATCH 1/1] util-linux-ng: Fixed dangling symlinks.

[Leon Woestenberg]

Acked-by: Leon Woestenberg <leon@sidebranch.com>

Hehe, I cheat.
-- 
Leon

[STABLE][PATCH 1/1] util-linux-ng: depend on virtual/libintl to pass building with uclibc

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

---
 recipes/util-linux-ng/util-linux-ng.inc       |    2 +-
 recipes/util-linux-ng/util-linux-ng_2.13.1.bb |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index dda9792..01e769e 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system."
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "udev zlib ncurses e2fsprogs-libs"
+DEPENDS = "udev zlib ncurses e2fsprogs-libs virtual/libintl"
 
 inherit autotools
 
diff --git a/recipes/util-linux-ng/util-linux-ng_2.13.1.bb b/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
index 946147d..8fded14 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
@@ -1,5 +1,6 @@
 require util-linux-ng.inc
 
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-${PV}${RC}.tar.bz2"
 #SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
 #SRC_URI += "file://glibc-fix.patch;patch=1"
 #SRC_URI += "file://glibc-umount2.patch;patch=1"
-- 
1.6.2.3

Re: [STABLE][PATCH 1/1] util-linux-ng: depend on virtual/libintl to pass building with uclibc

[Tom Rini]

On Mon, Apr 20, 2009 at 05:25:00PM +0200, Marcin Juszkiewicz wrote:

> From: Marcin Juszkiewicz <hrw@openembedded.org>

Acked-by: Tom Rini <trini@embeddedalley.com>

> ---
>  recipes/util-linux-ng/util-linux-ng.inc       |    2 +-
>  recipes/util-linux-ng/util-linux-ng_2.13.1.bb |    1 +
>  2 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
> index dda9792..01e769e 100644
> --- a/recipes/util-linux-ng/util-linux-ng.inc
> +++ b/recipes/util-linux-ng/util-linux-ng.inc
> @@ -1,7 +1,7 @@
>  DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system."
>  SECTION = "base"
>  LICENSE = "GPL"
> -DEPENDS = "udev zlib ncurses e2fsprogs-libs"
> +DEPENDS = "udev zlib ncurses e2fsprogs-libs virtual/libintl"
>  
>  inherit autotools
>  
> diff --git a/recipes/util-linux-ng/util-linux-ng_2.13.1.bb b/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
> index 946147d..8fded14 100644
> --- a/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
> +++ b/recipes/util-linux-ng/util-linux-ng_2.13.1.bb
> @@ -1,5 +1,6 @@
>  require util-linux-ng.inc
>  
> +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-${PV}${RC}.tar.bz2"
>  #SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
>  #SRC_URI += "file://glibc-fix.patch;patch=1"
>  #SRC_URI += "file://glibc-umount2.patch;patch=1"
> -- 
> 1.6.2.3
> 
> 
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Tom Rini

Re: [STABLE][PATCH 1/1] util-linux-ng: depend on virtual/libintl to pass building with uclibc

[Leon Woestenberg]

Acked-by: Leon Woestenberg <leon@sidebranch.com>

-- 
Leon

[STABLE][PATCH 1/1] checksums.ini: added checksum for util-linux-ng 2.13.1

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

---
 conf/checksums.ini |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 948a4bf..051057d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -23186,6 +23186,10 @@ sha256=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
 md5=af9d9e03038481fbf79ea3ac33f116f9
 sha256=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
 
+[http://kernel.org/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-2.13.1.tar.bz2]
+md5=424badc1832e4b5291a2ec04e9e244f4
+sha256=e67d86683adef0855220b6f5a4b7ca2c51a15faa142e2ecd69925ede76854a4d
+
 [http://kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.tar.bz2]
 md5=23f227da49df36f33fe47e917e332cd8
 sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c
-- 
1.6.2.3

Re: [STABLE][PATCH 1/1] checksums.ini: added checksum for util-linux-ng 2.13.1

[Leon Woestenberg]

Acked-by: Leon Woestenberg <leon@sidebranch.com>

-- 
Leon

Re: [STABLE][PATCH 1/1] checksums.ini: added checksum for util-linux-ng 2.13.1

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>


On 20-04-09 17:25, Marcin Juszkiewicz wrote:
> From: Marcin Juszkiewicz<hrw@openembedded.org>
>
> ---
>   conf/checksums.ini |    4 ++++
>   1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/conf/checksums.ini b/conf/checksums.ini
> index 948a4bf..051057d 100644
> --- a/conf/checksums.ini
> +++ b/conf/checksums.ini
> @@ -23186,6 +23186,10 @@ sha256=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
>   md5=af9d9e03038481fbf79ea3ac33f116f9
>   sha256=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
>
> +[http://kernel.org/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-2.13.1.tar.bz2]
> +md5=424badc1832e4b5291a2ec04e9e244f4
> +sha256=e67d86683adef0855220b6f5a4b7ca2c51a15faa142e2ecd69925ede76854a4d
> +
>   [http://kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.tar.bz2]
>   md5=23f227da49df36f33fe47e917e332cd8
>   sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c

[STABLE][PATCH 1/1] hostap-utils-0.4.7: use LDFLAGS (fixes QA error)

[Marcin Juszkiewicz]

From: Jeremy Lainé <jeremy.laine@m4x.org>

---
 recipes/hostap/hostap-utils-0.4.7/ldflags.patch |   24 +++++++++++++++++++++++
 recipes/hostap/hostap-utils_0.4.7.bb            |   24 ++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
 create mode 100644 recipes/hostap/hostap-utils-0.4.7/ldflags.patch

diff --git a/recipes/hostap/hostap-utils-0.4.7/ldflags.patch b/recipes/hostap/hostap-utils-0.4.7/ldflags.patch
new file mode 100644
index 0000000..d2ca298
--- /dev/null
+++ b/recipes/hostap/hostap-utils-0.4.7/ldflags.patch
@@ -0,0 +1,24 @@
+diff -urN hostap-utils-0.4.7.orig/Makefile hostap-utils-0.4.7/Makefile
+--- hostap-utils-0.4.7.orig/Makefile	2005-01-01 06:42:51.000000000 +0000
++++ hostap-utils-0.4.7/Makefile	2009-04-08 08:36:46.000000000 +0000
+@@ -14,17 +14,17 @@
+ hostap_crypt_conf: hostap_crypt_conf.c
+ 
+ hostap_diag: hostap_diag.o util.o
+-	$(CC) -o hostap_diag $(CFLAGS) hostap_diag.o util.o
++	$(CC) -o hostap_diag $(CFLAGS) $(LDFLAGS) hostap_diag.o util.o
+ 
+ hostap_diag.o: hostap_diag.c util.h
+ 
+ util.o: util.c util.h
+ 
+ hostap_io_debug: hostap_io_debug.c
+-	$(CC) -o hostap_io_debug $(CFLAGS) hostap_io_debug.c
++	$(CC) -o hostap_io_debug $(CFLAGS) $(LDFLAGS) hostap_io_debug.c
+ 
+ hostap_rid: hostap_rid.o util.o
+-	$(CC) -o hostap_rid $(CFLAGS) hostap_rid.o util.o
++	$(CC) -o hostap_rid $(CFLAGS) $(LDFLAGS) hostap_rid.o util.o
+ 
+ hostap_rid.o: hostap_rid.c util.h
+ 
diff --git a/recipes/hostap/hostap-utils_0.4.7.bb b/recipes/hostap/hostap-utils_0.4.7.bb
index 9fe362b..5635947 100644
--- a/recipes/hostap/hostap-utils_0.4.7.bb
+++ b/recipes/hostap/hostap-utils_0.4.7.bb
@@ -1 +1,23 @@
-require hostap-utils.inc
+DESCRIPTION = "User mode helpers for the hostap driver"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r6"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
+	   file://hostap-fw-load.patch;patch=1 \
+	   file://ldflags.patch;patch=1"
+
+S = "${WORKDIR}/hostap-utils-${PV}"
+
+BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \
+	    hostap_rid prism2_param prism2_srec split_combined_hex"
+
+do_install() {
+	install -d ${D}${sbindir}/
+	for f in ${BINARIES}
+	do
+		install -m 0755 $f ${D}${sbindir}/
+	done
+}
-- 
1.6.2.3

Re: [STABLE][PATCH 1/1] hostap-utils-0.4.7: use LDFLAGS (fixes QA error)

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>


On 20-04-09 17:25, Marcin Juszkiewicz wrote:
> From: Jeremy Lainé<jeremy.laine@m4x.org>
>
> ---
>   recipes/hostap/hostap-utils-0.4.7/ldflags.patch |   24 +++++++++++++++++++++++
>   recipes/hostap/hostap-utils_0.4.7.bb            |   24 ++++++++++++++++++++++-
>   2 files changed, 47 insertions(+), 1 deletions(-)
>   create mode 100644 recipes/hostap/hostap-utils-0.4.7/ldflags.patch
>
> diff --git a/recipes/hostap/hostap-utils-0.4.7/ldflags.patch b/recipes/hostap/hostap-utils-0.4.7/ldflags.patch
> new file mode 100644
> index 0000000..d2ca298
> --- /dev/null
> +++ b/recipes/hostap/hostap-utils-0.4.7/ldflags.patch
> @@ -0,0 +1,24 @@
> +diff -urN hostap-utils-0.4.7.orig/Makefile hostap-utils-0.4.7/Makefile
> +--- hostap-utils-0.4.7.orig/Makefile	2005-01-01 06:42:51.000000000 +0000
> ++++ hostap-utils-0.4.7/Makefile	2009-04-08 08:36:46.000000000 +0000
> +@@ -14,17 +14,17 @@
> + hostap_crypt_conf: hostap_crypt_conf.c
> +
> + hostap_diag: hostap_diag.o util.o
> +-	$(CC) -o hostap_diag $(CFLAGS) hostap_diag.o util.o
> ++	$(CC) -o hostap_diag $(CFLAGS) $(LDFLAGS) hostap_diag.o util.o
> +
> + hostap_diag.o: hostap_diag.c util.h
> +
> + util.o: util.c util.h
> +
> + hostap_io_debug: hostap_io_debug.c
> +-	$(CC) -o hostap_io_debug $(CFLAGS) hostap_io_debug.c
> ++	$(CC) -o hostap_io_debug $(CFLAGS) $(LDFLAGS) hostap_io_debug.c
> +
> + hostap_rid: hostap_rid.o util.o
> +-	$(CC) -o hostap_rid $(CFLAGS) hostap_rid.o util.o
> ++	$(CC) -o hostap_rid $(CFLAGS) $(LDFLAGS) hostap_rid.o util.o
> +
> + hostap_rid.o: hostap_rid.c util.h
> +
> diff --git a/recipes/hostap/hostap-utils_0.4.7.bb b/recipes/hostap/hostap-utils_0.4.7.bb
> index 9fe362b..5635947 100644
> --- a/recipes/hostap/hostap-utils_0.4.7.bb
> +++ b/recipes/hostap/hostap-utils_0.4.7.bb
> @@ -1 +1,23 @@
> -require hostap-utils.inc
> +DESCRIPTION = "User mode helpers for the hostap driver"
> +HOMEPAGE = "http://hostap.epitest.fi"
> +SECTION = "kernel/userland"
> +PRIORITY = "optional"
> +LICENSE = "GPL"
> +PR = "r6"
> +
> +SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
> +	   file://hostap-fw-load.patch;patch=1 \
> +	   file://ldflags.patch;patch=1"
> +
> +S = "${WORKDIR}/hostap-utils-${PV}"
> +
> +BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \
> +	    hostap_rid prism2_param prism2_srec split_combined_hex"
> +
> +do_install() {
> +	install -d ${D}${sbindir}/
> +	for f in ${BINARIES}
> +	do
> +		install -m 0755 $f ${D}${sbindir}/
> +	done
> +}

Re: [STABLE][PATCH 1/1] hostap-utils-0.4.7: use LDFLAGS (fixes QA error)

[Denys Dmytriyenko]

On Mon, Apr 20, 2009 at 06:33:55PM +0200, Koen Kooi wrote:
> Acked-by: Koen Kooi <koen@openembedded.org>

Acked-by: Denys Dmytriyenko <denis@denix.org>


> On 20-04-09 17:25, Marcin Juszkiewicz wrote:
>> From: Jeremy Lain??<jeremy.laine@m4x.org>
>>
>> ---
>>   recipes/hostap/hostap-utils-0.4.7/ldflags.patch |   24 
>> +++++++++++++++++++++++
>>   recipes/hostap/hostap-utils_0.4.7.bb            |   24 
>> ++++++++++++++++++++++-
>>   2 files changed, 47 insertions(+), 1 deletions(-)
>>   create mode 100644 recipes/hostap/hostap-utils-0.4.7/ldflags.patch
>>
>> diff --git a/recipes/hostap/hostap-utils-0.4.7/ldflags.patch 
>> b/recipes/hostap/hostap-utils-0.4.7/ldflags.patch
>> new file mode 100644
>> index 0000000..d2ca298
>> --- /dev/null
>> +++ b/recipes/hostap/hostap-utils-0.4.7/ldflags.patch
>> @@ -0,0 +1,24 @@
>> +diff -urN hostap-utils-0.4.7.orig/Makefile hostap-utils-0.4.7/Makefile
>> +--- hostap-utils-0.4.7.orig/Makefile	2005-01-01 06:42:51.000000000 +0000
>> ++++ hostap-utils-0.4.7/Makefile	2009-04-08 08:36:46.000000000 +0000
>> +@@ -14,17 +14,17 @@
>> + hostap_crypt_conf: hostap_crypt_conf.c
>> +
>> + hostap_diag: hostap_diag.o util.o
>> +-	$(CC) -o hostap_diag $(CFLAGS) hostap_diag.o util.o
>> ++	$(CC) -o hostap_diag $(CFLAGS) $(LDFLAGS) hostap_diag.o util.o
>> +
>> + hostap_diag.o: hostap_diag.c util.h
>> +
>> + util.o: util.c util.h
>> +
>> + hostap_io_debug: hostap_io_debug.c
>> +-	$(CC) -o hostap_io_debug $(CFLAGS) hostap_io_debug.c
>> ++	$(CC) -o hostap_io_debug $(CFLAGS) $(LDFLAGS) hostap_io_debug.c
>> +
>> + hostap_rid: hostap_rid.o util.o
>> +-	$(CC) -o hostap_rid $(CFLAGS) hostap_rid.o util.o
>> ++	$(CC) -o hostap_rid $(CFLAGS) $(LDFLAGS) hostap_rid.o util.o
>> +
>> + hostap_rid.o: hostap_rid.c util.h
>> +
>> diff --git a/recipes/hostap/hostap-utils_0.4.7.bb 
>> b/recipes/hostap/hostap-utils_0.4.7.bb
>> index 9fe362b..5635947 100644
>> --- a/recipes/hostap/hostap-utils_0.4.7.bb
>> +++ b/recipes/hostap/hostap-utils_0.4.7.bb
>> @@ -1 +1,23 @@
>> -require hostap-utils.inc
>> +DESCRIPTION = "User mode helpers for the hostap driver"
>> +HOMEPAGE = "http://hostap.epitest.fi"
>> +SECTION = "kernel/userland"
>> +PRIORITY = "optional"
>> +LICENSE = "GPL"
>> +PR = "r6"
>> +
>> +SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
>> +	   file://hostap-fw-load.patch;patch=1 \
>> +	   file://ldflags.patch;patch=1"
>> +
>> +S = "${WORKDIR}/hostap-utils-${PV}"
>> +
>> +BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug 
>> \
>> +	    hostap_rid prism2_param prism2_srec split_combined_hex"
>> +
>> +do_install() {
>> +	install -d ${D}${sbindir}/
>> +	for f in ${BINARIES}
>> +	do
>> +		install -m 0755 $f ${D}${sbindir}/
>> +	done
>> +}
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

[STABLE][PATCH 1/1] irda-utils: add patch to use LDFLAGS (fixes QA error)

[Marcin Juszkiewicz]

From: Jeremy Lainé <jeremy.laine@m4x.org>

---
 recipes/irda-utils/irda-utils/ldflags.patch |   28 +++++++++++++++++++++++++++
 recipes/irda-utils/irda-utils_0.9.16.bb     |    3 +-
 2 files changed, 30 insertions(+), 1 deletions(-)
 create mode 100644 recipes/irda-utils/irda-utils/ldflags.patch

diff --git a/recipes/irda-utils/irda-utils/ldflags.patch b/recipes/irda-utils/irda-utils/ldflags.patch
new file mode 100644
index 0000000..bb4f5cd
--- /dev/null
+++ b/recipes/irda-utils/irda-utils/ldflags.patch
@@ -0,0 +1,28 @@
+diff -urN irda-utils-0.9.16.orig/irattach/Makefile irda-utils-0.9.16/irattach/Makefile
+--- irda-utils-0.9.16.orig/irattach/Makefile	2004-03-31 23:55:41.000000000 +0200
++++ irda-utils-0.9.16/irattach/Makefile	2009-04-08 10:17:39.000000000 +0200
+@@ -53,10 +53,10 @@
+ all: $(TARGETS)
+ 
+ irattach: irattach.o util.o
+-	$(CC) $(CFLAGS) irattach.o util.o -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
+ 
+ dongle_attach: dongle_attach.o
+-	$(CC) $(CFLAGS) dongle_attach.o -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
+diff -urN irda-utils-0.9.16.orig/irdaping/Makefile irda-utils-0.9.16/irdaping/Makefile
+--- irda-utils-0.9.16.orig/irdaping/Makefile	2004-03-31 23:55:47.000000000 +0200
++++ irda-utils-0.9.16/irdaping/Makefile	2009-04-08 10:17:57.000000000 +0200
+@@ -52,7 +52,7 @@
+ all:: irdaping
+ 
+ irdaping: $(OBJS)
+-	$(CC) $(CFLAGS) $(OBJS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
diff --git a/recipes/irda-utils/irda-utils_0.9.16.bb b/recipes/irda-utils/irda-utils_0.9.16.bb
index 19bcdf3..1d9d184 100644
--- a/recipes/irda-utils/irda-utils_0.9.16.bb
+++ b/recipes/irda-utils/irda-utils_0.9.16.bb
@@ -3,11 +3,12 @@ IrDA allows communication over Infrared with other devices \
 such as phones and laptops."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
 	   file://m4.patch;patch=1 \
+	   file://ldflags.patch;patch=1 \
 	   file://init"
 
 export SYS_INCLUDES="-I${STAGING_INCDIR}"
-- 
1.6.2.3

Re: [STABLE][PATCH 1/1] irda-utils: add patch to use LDFLAGS (fixes QA error)

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>


On 20-04-09 17:25, Marcin Juszkiewicz wrote:
> From: Jeremy Lainé<jeremy.laine@m4x.org>
>
> ---
>   recipes/irda-utils/irda-utils/ldflags.patch |   28 +++++++++++++++++++++++++++
>   recipes/irda-utils/irda-utils_0.9.16.bb     |    3 +-
>   2 files changed, 30 insertions(+), 1 deletions(-)
>   create mode 100644 recipes/irda-utils/irda-utils/ldflags.patch
>
> diff --git a/recipes/irda-utils/irda-utils/ldflags.patch b/recipes/irda-utils/irda-utils/ldflags.patch
> new file mode 100644
> index 0000000..bb4f5cd
> --- /dev/null
> +++ b/recipes/irda-utils/irda-utils/ldflags.patch
> @@ -0,0 +1,28 @@
> +diff -urN irda-utils-0.9.16.orig/irattach/Makefile irda-utils-0.9.16/irattach/Makefile
> +--- irda-utils-0.9.16.orig/irattach/Makefile	2004-03-31 23:55:41.000000000 +0200
> ++++ irda-utils-0.9.16/irattach/Makefile	2009-04-08 10:17:39.000000000 +0200
> +@@ -53,10 +53,10 @@
> + all: $(TARGETS)
> +
> + irattach: irattach.o util.o
> +-	$(CC) $(CFLAGS) irattach.o util.o -o $@
> ++	$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
> +
> + dongle_attach: dongle_attach.o
> +-	$(CC) $(CFLAGS) dongle_attach.o -o $@
> ++	$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
> +
> + .c.o:
> + 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
> +diff -urN irda-utils-0.9.16.orig/irdaping/Makefile irda-utils-0.9.16/irdaping/Makefile
> +--- irda-utils-0.9.16.orig/irdaping/Makefile	2004-03-31 23:55:47.000000000 +0200
> ++++ irda-utils-0.9.16/irdaping/Makefile	2009-04-08 10:17:57.000000000 +0200
> +@@ -52,7 +52,7 @@
> + all:: irdaping
> +
> + irdaping: $(OBJS)
> +-	$(CC) $(CFLAGS) $(OBJS) -o $@
> ++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
> +
> + .c.o:
> + 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
> diff --git a/recipes/irda-utils/irda-utils_0.9.16.bb b/recipes/irda-utils/irda-utils_0.9.16.bb
> index 19bcdf3..1d9d184 100644
> --- a/recipes/irda-utils/irda-utils_0.9.16.bb
> +++ b/recipes/irda-utils/irda-utils_0.9.16.bb
> @@ -3,11 +3,12 @@ IrDA allows communication over Infrared with other devices \
>   such as phones and laptops."
>   SECTION = "base"
>   LICENSE = "GPL"
> -PR = "r8"
> +PR = "r9"
>
>   SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
>   	   file://configure.patch;patch=1 \
>   	   file://m4.patch;patch=1 \
> +	   file://ldflags.patch;patch=1 \
>   	   file://init"
>
>   export SYS_INCLUDES="-I${STAGING_INCDIR}"

Re: [STABLE][PATCH 1/1] irda-utils: add patch to use LDFLAGS (fixes QA error)

[Denys Dmytriyenko]

On Mon, Apr 20, 2009 at 06:34:06PM +0200, Koen Kooi wrote:
> Acked-by: Koen Kooi <koen@openembedded.org>

Acked-by: Denys Dmytriyenko <denis@denix.org>


> On 20-04-09 17:25, Marcin Juszkiewicz wrote:
>> From: Jeremy Lain??<jeremy.laine@m4x.org>
>>
>> ---
>>   recipes/irda-utils/irda-utils/ldflags.patch |   28 
>> +++++++++++++++++++++++++++
>>   recipes/irda-utils/irda-utils_0.9.16.bb     |    3 +-
>>   2 files changed, 30 insertions(+), 1 deletions(-)
>>   create mode 100644 recipes/irda-utils/irda-utils/ldflags.patch
>>
>> diff --git a/recipes/irda-utils/irda-utils/ldflags.patch 
>> b/recipes/irda-utils/irda-utils/ldflags.patch
>> new file mode 100644
>> index 0000000..bb4f5cd
>> --- /dev/null
>> +++ b/recipes/irda-utils/irda-utils/ldflags.patch
>> @@ -0,0 +1,28 @@
>> +diff -urN irda-utils-0.9.16.orig/irattach/Makefile 
>> irda-utils-0.9.16/irattach/Makefile
>> +--- irda-utils-0.9.16.orig/irattach/Makefile	2004-03-31 
>> 23:55:41.000000000 +0200
>> ++++ irda-utils-0.9.16/irattach/Makefile	2009-04-08 10:17:39.000000000 
>> +0200
>> +@@ -53,10 +53,10 @@
>> + all: $(TARGETS)
>> +
>> + irattach: irattach.o util.o
>> +-	$(CC) $(CFLAGS) irattach.o util.o -o $@
>> ++	$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
>> +
>> + dongle_attach: dongle_attach.o
>> +-	$(CC) $(CFLAGS) dongle_attach.o -o $@
>> ++	$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
>> +
>> + .c.o:
>> + 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
>> +diff -urN irda-utils-0.9.16.orig/irdaping/Makefile 
>> irda-utils-0.9.16/irdaping/Makefile
>> +--- irda-utils-0.9.16.orig/irdaping/Makefile	2004-03-31 
>> 23:55:47.000000000 +0200
>> ++++ irda-utils-0.9.16/irdaping/Makefile	2009-04-08 10:17:57.000000000 
>> +0200
>> +@@ -52,7 +52,7 @@
>> + all:: irdaping
>> +
>> + irdaping: $(OBJS)
>> +-	$(CC) $(CFLAGS) $(OBJS) -o $@
>> ++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
>> +
>> + .c.o:
>> + 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
>> diff --git a/recipes/irda-utils/irda-utils_0.9.16.bb 
>> b/recipes/irda-utils/irda-utils_0.9.16.bb
>> index 19bcdf3..1d9d184 100644
>> --- a/recipes/irda-utils/irda-utils_0.9.16.bb
>> +++ b/recipes/irda-utils/irda-utils_0.9.16.bb
>> @@ -3,11 +3,12 @@ IrDA allows communication over Infrared with other 
>> devices \
>>   such as phones and laptops."
>>   SECTION = "base"
>>   LICENSE = "GPL"
>> -PR = "r8"
>> +PR = "r9"
>>
>>   SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
>>   	   file://configure.patch;patch=1 \
>>   	   file://m4.patch;patch=1 \
>> +	   file://ldflags.patch;patch=1 \
>>   	   file://init"
>>
>>   export SYS_INCLUDES="-I${STAGING_INCDIR}"
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

[STABLE][PATCH 1/1] uclibc: use LDFLAGS for ldd and ldconfig (fixes QA error)

[Marcin Juszkiewicz]

From: Dirk Opfer <dirk@do13.de>

---
 recipes/uclibc/uclibc.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc
index be085ab..f2f3e9b 100644
--- a/recipes/uclibc/uclibc.inc
+++ b/recipes/uclibc/uclibc.inc
@@ -208,7 +208,7 @@ do_install() {
 		rmdir ${D}/usr/bin
 	fi
 
-        oe_runmake utils
+        oe_runmake "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" utils
         oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
                 install_utils
 	
-- 
1.6.2.3

Re: [STABLE][PATCH 1/1] uclibc: use LDFLAGS for ldd and ldconfig (fixes QA error)

[Dirk Opfer]

Acked-by: Dirk Opfer <Dirk <at> do13.de>

> From: Dirk Opfer <dirk@do13.de>
>
> ---
>  recipes/uclibc/uclibc.inc |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc
> index be085ab..f2f3e9b 100644
> --- a/recipes/uclibc/uclibc.inc
> +++ b/recipes/uclibc/uclibc.inc
> @@ -208,7 +208,7 @@ do_install() {
>  		rmdir ${D}/usr/bin
>  	fi
>
> -        oe_runmake utils
> +        oe_runmake "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" utils
>          oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/
> RUNTIME_PREFIX=/ \
>                  install_utils
>
> --
> 1.6.2.3
>
>
>
>

Re: [STABLE][PATCH 1/1] uclibc: use LDFLAGS for ldd and ldconfig (fixes QA error)

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>

On 20-04-09 17:25, Marcin Juszkiewicz wrote:
> From: Dirk Opfer<dirk@do13.de>
>
> ---
>   recipes/uclibc/uclibc.inc |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc
> index be085ab..f2f3e9b 100644
> --- a/recipes/uclibc/uclibc.inc
> +++ b/recipes/uclibc/uclibc.inc
> @@ -208,7 +208,7 @@ do_install() {
>   		rmdir ${D}/usr/bin
>   	fi
>
> -        oe_runmake utils
> +        oe_runmake "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" utils
>           oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
>                   install_utils
>   	

Re: [STABLE] Some fixes from .dev tree

[Marcin Juszkiewicz]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]


O crap.. I forgot to SOB/Ack all patches...

All patches in this thread (sent by me) are:

Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>

As some were done by me and some by others.

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 204 bytes --]

Re: [STABLE] Some fixes from .dev tree

[Marcin Juszkiewicz]

Dnia poniedziałek, 20 kwietnia 2009 o 17:24:53 Marcin Juszkiewicz 
napisał(a):
> All changes were tested for building on Debian 'sid'/amd64.

Thanks for review - all changes pushed to stable/2009.

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz