* [ptxdist] a @ 2011-10-30 21:52 Robert Schwebel 2011-10-30 21:54 ` [ptxdist] a few version bumps Robert Schwebel 0 siblings, 1 reply; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:52 UTC (permalink / raw) To: ptxdist Hi, Here are a few version bumps and small modifications. The autotools versions are available for quite a long time, and working with them for a while looks like they can be pushed. The following changes since commit 74cb6cb4668b87dac377f915b094d6674b4557f6: ptxd_lib_kgen: quote find pattern (2011-10-27 19:20:13 +0200) are available in the git repository at: git://git.pengutronix.de/git/rsc/ptxdist for-mainline Robert Schwebel (11): fbgrab: include zlib.h, fix linker dependencies util-linux-ng: version bump 2.19.1 -> 2.20 util-linux-ng: clean up package xorg-server: fix patch documentation xorg-server: fix patch documentation xorg-server: fix patch documentation xf86-video-fbdev: add fixme gtk: clean up host-autotools-autoconf: version bump 2.67 -> 2.68 host-autotools-automake: version bump 1.11 -> 1.11.1 host-autotools-libtool: version bump 2.2.6a -> 2.4.2 ...01-make-makefile-cross-compilation-aware.patch} | 14 ++-- .../fbgrab-1.0/0002-fbgrab-include-zlib.h.patch | 24 ++++ patches/fbgrab-1.0/series | 6 +- .../0002-__progname-redefinition-fix.patch | 112 -------------------- .../util-linux-2.19.1/0003-_s-undeclared-fix.patch | 29 ----- ...d-fallbacks-for-old-systems-without-umoun.patch | 14 ++-- .../0002-__progname-redefinition-fix.patch | 81 ++++++++++++++ .../0004-replace-index-with-strchr.patch | 14 ++-- .../{util-linux-2.19.1 => util-linux-2.20}/series | 1 - .../ignore-timing-option.diff | 1 + .../xorg-server-1.9.3/remove_dbus_if_disabled.diff | 2 +- .../xorg-server-1.9.3/remove_hal_if_disabled.diff | 2 +- .../xorg-server-1.9.3/remove_udev_if_disabled.diff | 2 +- rules/gtk.make | 65 +----------- rules/host-autotools-autoconf.make | 4 +- rules/host-autotools-automake.make | 4 +- rules/host-autotools-libtool.make | 8 +- rules/util-linux-ng.in | 42 ++++++++ rules/util-linux-ng.make | 67 +++++------- 19 files changed, 219 insertions(+), 273 deletions(-) rename patches/fbgrab-1.0/{fbgrab-1.0-crosscompile.diff => 0001-make-makefile-cross-compilation-aware.patch} (75%) create mode 100644 patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch delete mode 100644 patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch delete mode 100644 patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch rename patches/{util-linux-2.19.1 => util-linux-2.20}/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch (74%) create mode 100644 patches/util-linux-2.20/0002-__progname-redefinition-fix.patch rename patches/{util-linux-2.19.1 => util-linux-2.20}/0004-replace-index-with-strchr.patch (65%) rename patches/{util-linux-2.19.1 => util-linux-2.20}/series (89%) -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] a few version bumps 2011-10-30 21:52 [ptxdist] a Robert Schwebel @ 2011-10-30 21:54 ` Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel 0 siblings, 1 reply; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:54 UTC (permalink / raw) To: ptxdist Hi, Here are a few version bumps and small modifications. The autotools versions are available for quite a long time, and working with them for a while looks like they can be pushed. The following changes since commit 74cb6cb4668b87dac377f915b094d6674b4557f6: ptxd_lib_kgen: quote find pattern (2011-10-27 19:20:13 +0200) are available in the git repository at: git://git.pengutronix.de/git/rsc/ptxdist for-mainline Robert Schwebel (11): fbgrab: include zlib.h, fix linker dependencies util-linux-ng: version bump 2.19.1 -> 2.20 util-linux-ng: clean up package xorg-server: fix patch documentation xorg-server: fix patch documentation xorg-server: fix patch documentation xf86-video-fbdev: add fixme gtk: clean up host-autotools-autoconf: version bump 2.67 -> 2.68 host-autotools-automake: version bump 1.11 -> 1.11.1 host-autotools-libtool: version bump 2.2.6a -> 2.4.2 ...01-make-makefile-cross-compilation-aware.patch} | 14 ++-- .../fbgrab-1.0/0002-fbgrab-include-zlib.h.patch | 24 ++++ patches/fbgrab-1.0/series | 6 +- .../0002-__progname-redefinition-fix.patch | 112 -------------------- .../util-linux-2.19.1/0003-_s-undeclared-fix.patch | 29 ----- ...d-fallbacks-for-old-systems-without-umoun.patch | 14 ++-- .../0002-__progname-redefinition-fix.patch | 81 ++++++++++++++ .../0004-replace-index-with-strchr.patch | 14 ++-- .../{util-linux-2.19.1 => util-linux-2.20}/series | 1 - .../ignore-timing-option.diff | 1 + .../xorg-server-1.9.3/remove_dbus_if_disabled.diff | 2 +- .../xorg-server-1.9.3/remove_hal_if_disabled.diff | 2 +- .../xorg-server-1.9.3/remove_udev_if_disabled.diff | 2 +- rules/gtk.make | 65 +----------- rules/host-autotools-autoconf.make | 4 +- rules/host-autotools-automake.make | 4 +- rules/host-autotools-libtool.make | 8 +- rules/util-linux-ng.in | 42 ++++++++ rules/util-linux-ng.make | 67 +++++------- 19 files changed, 219 insertions(+), 273 deletions(-) rename patches/fbgrab-1.0/{fbgrab-1.0-crosscompile.diff => 0001-make-makefile-cross-compilation-aware.patch} (75%) create mode 100644 patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch delete mode 100644 patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch delete mode 100644 patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch rename patches/{util-linux-2.19.1 => util-linux-2.20}/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch (74%) create mode 100644 patches/util-linux-2.20/0002-__progname-redefinition-fix.patch rename patches/{util-linux-2.19.1 => util-linux-2.20}/0004-replace-index-with-strchr.patch (65%) rename patches/{util-linux-2.19.1 => util-linux-2.20}/series (89%) rsc -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies 2011-10-30 21:54 ` [ptxdist] a few version bumps Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20 Robert Schwebel ` (9 more replies) 0 siblings, 10 replies; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel - We have to include zlib.h explicitly when using symbols from there. - fbgrab does not link directly against zlib, and if libpng needs it, we can leave the job of finding the right libs to pkg_config Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- ...001-make-makefile-cross-compilation-aware.patch | 37 ++++++++++++++++++++ .../fbgrab-1.0/0002-fbgrab-include-zlib.h.patch | 24 +++++++++++++ patches/fbgrab-1.0/fbgrab-1.0-crosscompile.diff | 37 -------------------- patches/fbgrab-1.0/series | 6 +++- 4 files changed, 66 insertions(+), 38 deletions(-) create mode 100644 patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch create mode 100644 patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch delete mode 100644 patches/fbgrab-1.0/fbgrab-1.0-crosscompile.diff diff --git a/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch b/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch new file mode 100644 index 0000000..9fd77f9 --- /dev/null +++ b/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch @@ -0,0 +1,37 @@ +From: Roland Hostettler <r.hostettler@gmx.ch> +Date: Tue, 16 Aug 2011 17:35:19 +0200 +Subject: [PATCH] make makefile cross compilation aware + +The upstream makefile is not usable for cross compilation. +[wsa] Simplified 'strip' support + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> +--- + Makefile | 11 +++++------ + 1 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index 14c63cb..252b098 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,13 +4,12 @@ + ### + + fbgrab: fbgrab.c +- splint +posixlib fbgrab.c +- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab ++# splint +posixlib fbgrab.c ++ ${CC} ${CPPFLAGS} ${LDFLAGS} fbgrab.c -o fbgrab + + install: +- strip fbgrab +- install fbgrab /usr/bin/fbgrab +- install fbgrab.1.man /usr/man/man1/fbgrab.1 ++ install -s fbgrab ${DESTDIR}/usr/bin/fbgrab ++ install fbgrab.1.man ${DESTDIR}/usr/man/man1/fbgrab.1 + + clean: +- rm -f fbgrab *~ \#*\# +\ No newline at end of file ++ rm -f fbgrab *~ \#*\# diff --git a/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch b/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch new file mode 100644 index 0000000..6c1b33e --- /dev/null +++ b/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch @@ -0,0 +1,24 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Date: Tue, 16 Aug 2011 17:36:49 +0200 +Subject: [PATCH] fbgrab: include zlib.h + +Newer libpng versions do not include zlib.h in their api any more, so if +we use symbols from there, we should include zlib.h directly. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +--- + fbgrab.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/fbgrab.c b/fbgrab.c +index fc89f5a..0c959f6 100644 +--- a/fbgrab.c ++++ b/fbgrab.c +@@ -23,6 +23,7 @@ + #include <getopt.h> + #include <sys/vt.h> /* to handle vt changing */ + #include <png.h> /* PNG lib */ ++#include <zlib.h> /* zlib */ + #include <linux/fb.h> /* to handle framebuffer ioctls */ + + #define VERSION "1.0 beta 1" diff --git a/patches/fbgrab-1.0/fbgrab-1.0-crosscompile.diff b/patches/fbgrab-1.0/fbgrab-1.0-crosscompile.diff deleted file mode 100644 index d85f71e..0000000 --- a/patches/fbgrab-1.0/fbgrab-1.0-crosscompile.diff +++ /dev/null @@ -1,37 +0,0 @@ -From: Roland Hostettler <r.hostettler@gmx.ch> -Subject: [patch] make makefile cross compilation aware - -The upstream makefile is not usable for cross compilation. -[wsa] Simplified 'strip' support - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> -Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> - ---- - Makefile | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -Index: Makefile -=================================================================== ---- a/Makefile.orig -+++ b/Makefile -@@ -4,13 +4,12 @@ - ### - - fbgrab: fbgrab.c -- splint +posixlib fbgrab.c -- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab -+# splint +posixlib fbgrab.c -+ ${CC} ${CPPFLAGS} ${LDFLAGS} fbgrab.c -o fbgrab - - install: -- strip fbgrab -- install fbgrab /usr/bin/fbgrab -- install fbgrab.1.man /usr/man/man1/fbgrab.1 -+ install -s fbgrab ${DESTDIR}/usr/bin/fbgrab -+ install fbgrab.1.man ${DESTDIR}/usr/man/man1/fbgrab.1 - - clean: -- rm -f fbgrab *~ \#*\# -\ No newline at end of file -+ rm -f fbgrab *~ \#*\# diff --git a/patches/fbgrab-1.0/series b/patches/fbgrab-1.0/series index d4a2f2b..45420ce 100644 --- a/patches/fbgrab-1.0/series +++ b/patches/fbgrab-1.0/series @@ -1 +1,5 @@ -fbgrab-1.0-crosscompile.diff +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-make-makefile-cross-compilation-aware.patch +0002-fbgrab-include-zlib.h.patch +# 07f6b94abfd5520604fa320ff0fa961c - git-ptx-patches magic -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 2011-11-03 14:21 ` Michael Olbrich 2011-10-30 21:56 ` [ptxdist] [PATCH 03/11] util-linux-ng: clean up package Robert Schwebel ` (8 subsequent siblings) 9 siblings, 1 reply; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel Checked new configure entries and added new tools, ported patches. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- ...d-fallbacks-for-old-systems-without-umoun.patch | 50 --------- .../0002-__progname-redefinition-fix.patch | 112 -------------------- .../util-linux-2.19.1/0003-_s-undeclared-fix.patch | 29 ----- .../0004-replace-index-with-strchr.patch | 33 ------ patches/util-linux-2.19.1/series | 7 -- ...d-fallbacks-for-old-systems-without-umoun.patch | 50 +++++++++ .../0002-__progname-redefinition-fix.patch | 81 ++++++++++++++ .../0004-replace-index-with-strchr.patch | 33 ++++++ patches/util-linux-2.20/series | 6 + rules/util-linux-ng.in | 42 ++++++++ rules/util-linux-ng.make | 50 ++++++++- 11 files changed, 257 insertions(+), 236 deletions(-) delete mode 100644 patches/util-linux-2.19.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch delete mode 100644 patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch delete mode 100644 patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch delete mode 100644 patches/util-linux-2.19.1/0004-replace-index-with-strchr.patch delete mode 100644 patches/util-linux-2.19.1/series create mode 100644 patches/util-linux-2.20/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch create mode 100644 patches/util-linux-2.20/0002-__progname-redefinition-fix.patch create mode 100644 patches/util-linux-2.20/0004-replace-index-with-strchr.patch create mode 100644 patches/util-linux-2.20/series diff --git a/patches/util-linux-2.19.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch b/patches/util-linux-2.19.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch deleted file mode 100644 index 770a951..0000000 --- a/patches/util-linux-2.19.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Karel Zak <kzak@redhat.com> -Date: Fri, 11 Feb 2011 10:45:09 +0100 -Subject: [PATCH] libmount: add fallbacks for old systems without umount2() - syscall - -Reported-by: Peter Breitenlohner <peb@mppmu.mpg.de> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - shlibs/mount/src/context_umount.c | 28 ++++++++++++++++++++++++++++ - 1 files changed, 28 insertions(+), 0 deletions(-) - -diff --git a/shlibs/mount/src/context_umount.c b/shlibs/mount/src/context_umount.c -index 69819e5..f7678a6 100644 ---- a/shlibs/mount/src/context_umount.c -+++ b/shlibs/mount/src/context_umount.c -@@ -49,6 +49,34 @@ umount2(const char *path, int flags) { - #endif - - -+#if defined(MNT_FORCE) -+/* Interesting ... it seems libc knows about MNT_FORCE and presumably -+ about umount2 as well -- need not do anything */ -+#else /* MNT_FORCE */ -+/* Does the present kernel source know about umount2? */ -+# include <linux/unistd.h> -+# ifdef __NR_umount2 -+static int umount2(const char *path, int flags); -+_syscall2(int, umount2, const char *, path, int, flags); -+# else /* __NR_umount2 */ -+static int -+umount2(const char *path, int flags) { -+ fprintf(stderr, _("umount: compiled without support for -f\n")); -+ errno = ENOSYS; -+ return -1; -+} -+#endif /* __NR_umount2 */ -+# if !defined(MNT_FORCE) -+# define MNT_FORCE 1 -+#endif -+ -+#endif /* MNT_FORCE */ -+ -+#if !defined(MNT_DETACH) -+#define MNT_DETACH 2 -+#endif -+ -+ - static int lookup_umount_fs(struct libmnt_context *cxt) - { - int rc; diff --git a/patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch b/patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch deleted file mode 100644 index 724f2cb..0000000 --- a/patches/util-linux-2.19.1/0002-__progname-redefinition-fix.patch +++ /dev/null @@ -1,112 +0,0 @@ -From: Jon Ringle <jon@ringle.org> -Date: Thu, 21 Apr 2011 17:08:15 -0400 -Subject: [PATCH] __progname redefinition fix - -Problem occurs with uclibc errno.h header - -In file included from ../include/writeall.h:7, - from swaplabel.c:35: -/opt/crosstool-ng-1.9.0/arm-1136j-linux-uclibcgnueabi/gcc-4.4.5-uClibc-0.9.30.2-binutils-2.20.1-kernel-2.6.32.25-sanitized/arm-1136j-linux-uclibcgnueabi//sys-root/usr/include/errno.h:55: error: conflicting types for '__progname' -../include/c.h:118: note: previous declaration of '__progname' was here - -Signed-off-by: Jon Ringle <jon@ringle.org> ---- - disk-utils/swaplabel.c | 2 +- - lib/at.c | 1 + - lib/tt.c | 1 + - shlibs/mount/src/cache.c | 3 ++- - shlibs/mount/src/iter.c | 1 + - shlibs/mount/src/mountP.h | 1 - - shlibs/mount/src/tab_parse.c | 1 + - 7 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c -index 9dc20b4..28990a7 100644 ---- a/disk-utils/swaplabel.c -+++ b/disk-utils/swaplabel.c -@@ -30,8 +30,8 @@ - # endif - #endif - --#include "c.h" - #include "writeall.h" -+#include "c.h" - #include "swapheader.h" - #include "strutils.h" - #include "nls.h" -diff --git a/lib/at.c b/lib/at.c -index 1993f99..3731a23 100644 ---- a/lib/at.c -+++ b/lib/at.c -@@ -7,6 +7,7 @@ - #include <stdlib.h> - #include <fcntl.h> - #include <sys/stat.h> -+#include <errno.h> - - #include "at.h" - -diff --git a/lib/tt.c b/lib/tt.c -index aa93bf5..79cc3d9 100644 ---- a/lib/tt.c -+++ b/lib/tt.c -@@ -15,6 +15,7 @@ - #include <unistd.h> - #include <string.h> - #include <termios.h> -+#include <errno.h> - #ifdef HAVE_SYS_IOCTL_H - #include <sys/ioctl.h> - #endif -diff --git a/shlibs/mount/src/cache.c b/shlibs/mount/src/cache.c -index 18b6cd4..f50e7dc 100644 ---- a/shlibs/mount/src/cache.c -+++ b/shlibs/mount/src/cache.c -@@ -24,9 +24,10 @@ - #include <unistd.h> - #include <fcntl.h> - #include <blkid.h> -+#include <errno.h> - --#include "canonicalize.h" - #include "mountP.h" -+#include "canonicalize.h" - - /* - * Canonicalized (resolved) paths & tags cache -diff --git a/shlibs/mount/src/iter.c b/shlibs/mount/src/iter.c -index 99fedd1..9cc1dee 100644 ---- a/shlibs/mount/src/iter.c -+++ b/shlibs/mount/src/iter.c -@@ -16,6 +16,7 @@ - #include <stdio.h> - #include <string.h> - #include <stdlib.h> -+#include <errno.h> - - #include "mountP.h" - -diff --git a/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h -index fa01bd5..35fd70f 100644 ---- a/shlibs/mount/src/mountP.h -+++ b/shlibs/mount/src/mountP.h -@@ -11,7 +11,6 @@ - #define _LIBMOUNT_PRIVATE_H - - #include <sys/types.h> --#include <errno.h> - #include "c.h" - - #define USE_UNSTABLE_LIBMOUNT_API -diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c -index e285c65..2fb37b7 100644 ---- a/shlibs/mount/src/tab_parse.c -+++ b/shlibs/mount/src/tab_parse.c -@@ -14,6 +14,7 @@ - #include <dirent.h> - #include <fcntl.h> - #include <unistd.h> -+#include <errno.h> - - #include "nls.h" - #include "at.h" diff --git a/patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch b/patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch deleted file mode 100644 index 62ba3ac..0000000 --- a/patches/util-linux-2.19.1/0003-_s-undeclared-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Jon Ringle <jon@ringle.org> -Date: Thu, 21 Apr 2011 17:44:28 -0400 -Subject: [PATCH] _s undeclared fix - -tt.c: In function 'recount_widths': -tt.c:398: error: '_s' undeclared (first use in this function) -tt.c:398: error: (Each undeclared identifier is reported only once -tt.c:398: error: for each function it appears in.) -tt.c: In function 'print_data': -tt.c:508: error: '_s' undeclared (first use in this function) - -Signed-off-by: Jon Ringle <jon@ringle.org> ---- - lib/tt.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/tt.c b/lib/tt.c -index 79cc3d9..a64c83c 100644 ---- a/lib/tt.c -+++ b/lib/tt.c -@@ -52,7 +52,7 @@ static const struct tt_symbols utf8_tt_symbols = { - }; - - #else /* !HAVE_WIDECHAR */ --# define mbs_width strlen(_s) -+# define mbs_width(_s) strlen(_s) - #endif /* !HAVE_WIDECHAR */ - - #define is_last_column(_tb, _cl) \ diff --git a/patches/util-linux-2.19.1/0004-replace-index-with-strchr.patch b/patches/util-linux-2.19.1/0004-replace-index-with-strchr.patch deleted file mode 100644 index 4df7a12..0000000 --- a/patches/util-linux-2.19.1/0004-replace-index-with-strchr.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Jon Ringle <jon@ringle.org> -Date: Tue, 24 May 2011 12:14:09 -0400 -Subject: [PATCH] replace index with strchr - -index is deprecated and not available in uclibc -replace with strchr - -Signed-off-by: Jon Ringle <jon@ringle.org> ---- - shlibs/mount/src/tab_parse.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c -index 2fb37b7..bd76c18 100644 ---- a/shlibs/mount/src/tab_parse.c -+++ b/shlibs/mount/src/tab_parse.c -@@ -286,14 +286,14 @@ static int mnt_table_parse_next(struct libmnt_table *tb, FILE *f, struct libmnt_ - if (fgets(buf, sizeof(buf), f) == NULL) - return -EINVAL; - ++*nlines; -- s = index (buf, '\n'); -+ s = strchr (buf, '\n'); - if (!s) { - /* Missing final newline? Otherwise extremely */ - /* long line - assume file was corrupted */ - if (feof(f)) { - DBG(TAB, mnt_debug_h(tb, - "%s: no final newline", filename)); -- s = index (buf, '\0'); -+ s = strchr (buf, '\0'); - } else { - DBG(TAB, mnt_debug_h(tb, - "%s:%d: missing newline at line", diff --git a/patches/util-linux-2.19.1/series b/patches/util-linux-2.19.1/series deleted file mode 100644 index 9fd3f6f..0000000 --- a/patches/util-linux-2.19.1/series +++ /dev/null @@ -1,7 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch -0002-__progname-redefinition-fix.patch -0003-_s-undeclared-fix.patch -0004-replace-index-with-strchr.patch -# b65ec9e159027bf7fdcbd29dd04b3d78 - git-ptx-patches magic diff --git a/patches/util-linux-2.20/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch b/patches/util-linux-2.20/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch new file mode 100644 index 0000000..a776e85 --- /dev/null +++ b/patches/util-linux-2.20/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch @@ -0,0 +1,50 @@ +From: Karel Zak <kzak@redhat.com> +Date: Fri, 11 Feb 2011 10:45:09 +0100 +Subject: [PATCH] libmount: add fallbacks for old systems without umount2() + syscall + +Reported-by: Peter Breitenlohner <peb@mppmu.mpg.de> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + libmount/src/context_umount.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +Index: util-linux-2.20/libmount/src/context_umount.c +=================================================================== +--- util-linux-2.20.orig/libmount/src/context_umount.c ++++ util-linux-2.20/libmount/src/context_umount.c +@@ -38,6 +38,34 @@ + #endif + + ++#if defined(MNT_FORCE) ++/* Interesting ... it seems libc knows about MNT_FORCE and presumably ++ about umount2 as well -- need not do anything */ ++#else /* MNT_FORCE */ ++/* Does the present kernel source know about umount2? */ ++# include <linux/unistd.h> ++# ifdef __NR_umount2 ++static int umount2(const char *path, int flags); ++_syscall2(int, umount2, const char *, path, int, flags); ++# else /* __NR_umount2 */ ++static int ++umount2(const char *path, int flags) { ++ fprintf(stderr, _("umount: compiled without support for -f\n")); ++ errno = ENOSYS; ++ return -1; ++} ++#endif /* __NR_umount2 */ ++# if !defined(MNT_FORCE) ++# define MNT_FORCE 1 ++#endif ++ ++#endif /* MNT_FORCE */ ++ ++#if !defined(MNT_DETACH) ++#define MNT_DETACH 2 ++#endif ++ ++ + static int lookup_umount_fs(struct libmnt_context *cxt) + { + int rc; diff --git a/patches/util-linux-2.20/0002-__progname-redefinition-fix.patch b/patches/util-linux-2.20/0002-__progname-redefinition-fix.patch new file mode 100644 index 0000000..a69d9f1 --- /dev/null +++ b/patches/util-linux-2.20/0002-__progname-redefinition-fix.patch @@ -0,0 +1,81 @@ +From: Jon Ringle <jon@ringle.org> +Date: Thu, 21 Apr 2011 17:08:15 -0400 +Subject: [PATCH] __progname redefinition fix + +Problem occurs with uclibc errno.h header + +In file included from ../include/writeall.h:7, + from swaplabel.c:35: +/opt/crosstool-ng-1.9.0/arm-1136j-linux-uclibcgnueabi/gcc-4.4.5-uClibc-0.9.30.2-binutils-2.20.1-kernel-2.6.32.25-sanitized/arm-1136j-linux-uclibcgnueabi//sys-root/usr/include/errno.h:55: error: conflicting types for '__progname' +../include/c.h:118: note: previous declaration of '__progname' was here + +Signed-off-by: Jon Ringle <jon@ringle.org> +--- + disk-utils/swaplabel.c | 2 +- + lib/at.c | 1 + + lib/tt.c | 1 + + libmount/src/cache.c | 1 + + libmount/src/iter.c | 1 + + libmount/src/tab_parse.c | 1 + + 6 files changed, 6 insertions(+), 1 deletion(-) + +Index: util-linux-2.20/lib/at.c +=================================================================== +--- util-linux-2.20.orig/lib/at.c ++++ util-linux-2.20/lib/at.c +@@ -7,6 +7,7 @@ + #include <stdlib.h> + #include <fcntl.h> + #include <sys/stat.h> ++#include <errno.h> + + #include "at.h" + #include "c.h" +Index: util-linux-2.20/lib/tt.c +=================================================================== +--- util-linux-2.20.orig/lib/tt.c ++++ util-linux-2.20/lib/tt.c +@@ -15,6 +15,7 @@ + #include <unistd.h> + #include <string.h> + #include <termios.h> ++#include <errno.h> + #ifdef HAVE_SYS_IOCTL_H + #include <sys/ioctl.h> + #endif +Index: util-linux-2.20/libmount/src/cache.c +=================================================================== +--- util-linux-2.20.orig/libmount/src/cache.c ++++ util-linux-2.20/libmount/src/cache.c +@@ -23,6 +23,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <blkid.h> ++#include <errno.h> + + #include "canonicalize.h" + #include "mountP.h" +Index: util-linux-2.20/libmount/src/iter.c +=================================================================== +--- util-linux-2.20.orig/libmount/src/iter.c ++++ util-linux-2.20/libmount/src/iter.c +@@ -16,6 +16,7 @@ + #include <stdio.h> + #include <string.h> + #include <stdlib.h> ++#include <errno.h> + + #include "mountP.h" + +Index: util-linux-2.20/libmount/src/tab_parse.c +=================================================================== +--- util-linux-2.20.orig/libmount/src/tab_parse.c ++++ util-linux-2.20/libmount/src/tab_parse.c +@@ -9,6 +9,7 @@ + #include <limits.h> + #include <dirent.h> + #include <fcntl.h> ++#include <errno.h> + + #include "at.h" + #include "mangle.h" diff --git a/patches/util-linux-2.20/0004-replace-index-with-strchr.patch b/patches/util-linux-2.20/0004-replace-index-with-strchr.patch new file mode 100644 index 0000000..1ed7c30 --- /dev/null +++ b/patches/util-linux-2.20/0004-replace-index-with-strchr.patch @@ -0,0 +1,33 @@ +From: Jon Ringle <jon@ringle.org> +Date: Tue, 24 May 2011 12:14:09 -0400 +Subject: [PATCH] replace index with strchr + +index is deprecated and not available in uclibc +replace with strchr + +Signed-off-by: Jon Ringle <jon@ringle.org> +--- + libmount/src/tab_parse.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: util-linux-2.20/libmount/src/tab_parse.c +=================================================================== +--- util-linux-2.20.orig/libmount/src/tab_parse.c ++++ util-linux-2.20/libmount/src/tab_parse.c +@@ -280,14 +280,14 @@ static int mnt_table_parse_next(struct l + if (fgets(buf, sizeof(buf), f) == NULL) + return -EINVAL; + ++*nlines; +- s = index (buf, '\n'); ++ s = strchr (buf, '\n'); + if (!s) { + /* Missing final newline? Otherwise extremely */ + /* long line - assume file was corrupted */ + if (feof(f)) { + DBG(TAB, mnt_debug_h(tb, + "%s: no final newline", filename)); +- s = index (buf, '\0'); ++ s = strchr (buf, '\0'); + } else { + DBG(TAB, mnt_debug_h(tb, + "%s:%d: missing newline at line", diff --git a/patches/util-linux-2.20/series b/patches/util-linux-2.20/series new file mode 100644 index 0000000..9e843db --- /dev/null +++ b/patches/util-linux-2.20/series @@ -0,0 +1,6 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch +0002-__progname-redefinition-fix.patch +0004-replace-index-with-strchr.patch +# b65ec9e159027bf7fdcbd29dd04b3d78 - git-ptx-patches magic diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index 48b1474..6fb0f18 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -23,12 +23,54 @@ config UTIL_LINUX_NG_LIBMOUNT config UTIL_LINUX_NG_USES_NCURSES bool +config UTIL_LINUX_NG_PARTX_TOOLS + bool + config UTIL_LINUX_NG_AGETTY bool prompt "agetty" help A small getty. +config UTIL_LINUX_NG_LINE + bool + prompt "line" + help + The line utility. + +config UTIL_LINUX_NG_ADDPART + bool + select UTIL_LINUX_NG_PARTX_TOOLS + prompt "addpart" + help + The addpart utility. + +config UTIL_LINUX_NG_DELPART + bool + select UTIL_LINUX_NG_PARTX_TOOLS + prompt "delpart" + help + The delpart utility. + +config UTIL_LINUX_NG_PARTX + bool + select UTIL_LINUX_NG_PARTX_TOOLS + prompt "partx" + help + The partx utility. + +config UTIL_LINUX_NG_MOUNTPOINT + bool + prompt "mountpoint" + help + The mountpoint utility. + +config UTIL_LINUX_NG_DDATE + bool + prompt "ddate" + help + The ddate utility. + config UTIL_LINUX_NG_FDISK bool prompt "fdisk" diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 499365d..519a885 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng # # Paths and names # -UTIL_LINUX_NG_VERSION := 2.19.1 -UTIL_LINUX_NG_MD5 := 3eab06f05163dfa65479c44e5231932c +UTIL_LINUX_NG_VERSION := 2.20 +UTIL_LINUX_NG_MD5 := 4dcacdbdafa116635e52b977d9d0e879 UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION) UTIL_LINUX_NG_SUFFIX := tar.bz2 -UTIL_LINUX_NG_URL := http://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX) +UTIL_LINUX_NG_URL := http://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX) UTIL_LINUX_NG_SOURCE := $(SRCDIR)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX) UTIL_LINUX_NG_DIR := $(BUILDDIR)/$(UTIL_LINUX_NG) UTIL_LINUX_NG_LICENSE := GPLv2+ @@ -62,11 +62,9 @@ UTIL_LINUX_NG_AUTOCONF := \ --disable-cramfs \ --disable-elvtune \ --disable-fallocate \ - --disable-init \ --disable-kill \ --disable-last \ --disable-mesg \ - --disable-partx \ --disable-raw \ --disable-rename \ --disable-reset \ @@ -87,6 +85,30 @@ UTIL_LINUX_NG_AUTOCONF := \ --without-audit \ --without-utempter +ifdef PTXCONF_UTIL_LINUX_NG_LINE +UTIL_LINUX_NG_AUTOCONF += --enable-line +else +UTIL_LINUX_NG_AUTOCONF += --disable-line +endif + +ifdef PTXCONF_UTIL_LINUX_NG_DDATE +UTIL_LINUX_NG_AUTOCONF += --enable-ddate +else +UTIL_LINUX_NG_AUTOCONF += --disable-ddate +endif + +ifdef PTXCONF_UTIL_LINUX_NG_MOUNTPOINT +UTIL_LINUX_NG_AUTOCONF += --enable-mountpoint +else +UTIL_LINUX_NG_AUTOCONF += --disable-mountpoint +endif + +ifdef PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS +UTIL_LINUX_NG_AUTOCONF += --enable-partx +else +UTIL_LINUX_NG_AUTOCONF += --disable-partx +endif + ifdef PTXCONF_UTIL_LINUX_NG_FSCK UTIL_LINUX_NG_AUTOCONF += --enable-fsck else @@ -118,6 +140,24 @@ $(STATEDIR)/util-linux-ng.targetinstall: @$(call install_fixup, util-linux-ng,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, util-linux-ng,DESCRIPTION,missing) +ifdef PTXCONF_UTIL_LINUX_NG_LINE + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/line) +endif +ifdef PTXCONF_UTIL_LINUX_NG_DDATE + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ddate) +endif +ifdef PTXCONF_UTIL_LINUX_NG_MOUNTPOINT + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /bin/mountpoint) +endif +ifdef PTXCONF_UTIL_LINUX_NG_ADDPART + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/addpart) +endif +ifdef PTXCONF_UTIL_LINUX_NG_DELPART + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/delpart) +endif +ifdef PTXCONF_UTIL_LINUX_NG_PARTX + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/partx) +endif ifdef PTXCONF_UTIL_LINUX_NG_AGETTY @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/agetty) endif -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20 2011-10-30 21:56 ` [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20 Robert Schwebel @ 2011-11-03 14:21 ` Michael Olbrich 0 siblings, 0 replies; 14+ messages in thread From: Michael Olbrich @ 2011-11-03 14:21 UTC (permalink / raw) To: ptxdist On Sun, Oct 30, 2011 at 10:56:12PM +0100, Robert Schwebel wrote: > diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make > index 499365d..519a885 100644 > --- a/rules/util-linux-ng.make > +++ b/rules/util-linux-ng.make > @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng > # > # Paths and names > # > -UTIL_LINUX_NG_VERSION := 2.19.1 > -UTIL_LINUX_NG_MD5 := 3eab06f05163dfa65479c44e5231932c > +UTIL_LINUX_NG_VERSION := 2.20 > +UTIL_LINUX_NG_MD5 := 4dcacdbdafa116635e52b977d9d0e879 The new version introduces a change in libuuid that breaks e2fsprogs. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 03/11] util-linux-ng: clean up package 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20 Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 04/11] xorg-server: fix patch documentation Robert Schwebel ` (7 subsequent siblings) 9 siblings, 0 replies; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- rules/util-linux-ng.make | 65 +++++---------------------------------------- 1 files changed, 8 insertions(+), 57 deletions(-) diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 519a885..f8fc568 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -27,14 +27,6 @@ UTIL_LINUX_NG_DIR := $(BUILDDIR)/$(UTIL_LINUX_NG) UTIL_LINUX_NG_LICENSE := GPLv2+ # ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(UTIL_LINUX_NG_SOURCE): - @$(call targetinfo) - @$(call get, UTIL_LINUX_NG) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -83,49 +75,14 @@ UTIL_LINUX_NG_AUTOCONF := \ --without-slang \ --without-selinux \ --without-audit \ - --without-utempter - -ifdef PTXCONF_UTIL_LINUX_NG_LINE -UTIL_LINUX_NG_AUTOCONF += --enable-line -else -UTIL_LINUX_NG_AUTOCONF += --disable-line -endif - -ifdef PTXCONF_UTIL_LINUX_NG_DDATE -UTIL_LINUX_NG_AUTOCONF += --enable-ddate -else -UTIL_LINUX_NG_AUTOCONF += --disable-ddate -endif - -ifdef PTXCONF_UTIL_LINUX_NG_MOUNTPOINT -UTIL_LINUX_NG_AUTOCONF += --enable-mountpoint -else -UTIL_LINUX_NG_AUTOCONF += --disable-mountpoint -endif - -ifdef PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS -UTIL_LINUX_NG_AUTOCONF += --enable-partx -else -UTIL_LINUX_NG_AUTOCONF += --disable-partx -endif - -ifdef PTXCONF_UTIL_LINUX_NG_FSCK -UTIL_LINUX_NG_AUTOCONF += --enable-fsck -else -UTIL_LINUX_NG_AUTOCONF += --disable-fsck -endif - -ifdef PTXCONF_UTIL_LINUX_NG_AGETTY -UTIL_LINUX_NG_AUTOCONF += --enable-agetty -else -UTIL_LINUX_NG_AUTOCONF += --disable-agetty -endif - -ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID -UTIL_LINUX_NG_AUTOCONF += --enable-libuuid -else -UTIL_LINUX_NG_AUTOCONF += --disable-libuuid -endif + --without-utempter \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LINE)-line \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_DDATE)-ddate \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNTPOINT)-mountpoint \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS)-partx \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_FSCK)-fsck \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid # ---------------------------------------------------------------------------- # Target-Install @@ -210,27 +167,21 @@ endif ifdef PTXCONF_UTIL_LINUX_NG_MCOOKIE @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mcookie) endif - ifdef PTXCONF_UTIL_LINUX_NG_LIBBLKID @$(call install_lib, util-linux-ng, 0, 0, 0644, libblkid) endif - ifdef PTXCONF_UTIL_LINUX_NG_BLKID @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/blkid) endif - ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID @$(call install_lib, util-linux-ng, 0, 0, 0644, libuuid) endif - ifdef PTXCONF_UTIL_LINUX_NG_LIBMOUNT # FIXME - no user yet endif - ifdef PTXCONF_UTIL_LINUX_NG_UUIDGEN @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/uuidgen) endif - ifdef PTXCONF_UTIL_LINUX_NG_FINDFS @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/findfs) endif -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 04/11] xorg-server: fix patch documentation 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20 Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 03/11] util-linux-ng: clean up package Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 05/11] " Robert Schwebel ` (6 subsequent siblings) 9 siblings, 0 replies; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel It is udev, not usb. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- .../xorg-server-1.9.3/remove_udev_if_disabled.diff | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patches/xorg-server-1.9.3/remove_udev_if_disabled.diff b/patches/xorg-server-1.9.3/remove_udev_if_disabled.diff index 8874eb4..0e36958 100644 --- a/patches/xorg-server-1.9.3/remove_udev_if_disabled.diff +++ b/patches/xorg-server-1.9.3/remove_udev_if_disabled.diff @@ -1,5 +1,5 @@ From: Juergen Beisert <jbe@pengutronix.de> -Subject: Check for LIBUSB only, if enabled +Subject: Check for LIBUDEV only if udev support is enabled Signed-off-by: Juergen Beisert <jbe@pengutronix.de> --- -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 05/11] xorg-server: fix patch documentation 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel ` (2 preceding siblings ...) 2011-10-30 21:56 ` [ptxdist] [PATCH 04/11] xorg-server: fix patch documentation Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 06/11] " Robert Schwebel ` (5 subsequent siblings) 9 siblings, 0 replies; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- .../xorg-server-1.9.3/remove_dbus_if_disabled.diff | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patches/xorg-server-1.9.3/remove_dbus_if_disabled.diff b/patches/xorg-server-1.9.3/remove_dbus_if_disabled.diff index 50737c2..4f6db7b 100644 --- a/patches/xorg-server-1.9.3/remove_dbus_if_disabled.diff +++ b/patches/xorg-server-1.9.3/remove_dbus_if_disabled.diff @@ -1,5 +1,5 @@ From: Juergen Beisert <jbe@pengutronix.de> -Subject: Check for DBUS only, if enabled +Subject: Check for DBUS only if dbus support is enabled Signed-off-by: Juergen Beisert <jbe@pengutronix.de> -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 06/11] xorg-server: fix patch documentation 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel ` (3 preceding siblings ...) 2011-10-30 21:56 ` [ptxdist] [PATCH 05/11] " Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 07/11] xf86-video-fbdev: add fixme Robert Schwebel ` (4 subsequent siblings) 9 siblings, 0 replies; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- .../xorg-server-1.9.3/remove_hal_if_disabled.diff | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patches/xorg-server-1.9.3/remove_hal_if_disabled.diff b/patches/xorg-server-1.9.3/remove_hal_if_disabled.diff index 184e2b5..3a7dc5c 100644 --- a/patches/xorg-server-1.9.3/remove_hal_if_disabled.diff +++ b/patches/xorg-server-1.9.3/remove_hal_if_disabled.diff @@ -1,5 +1,5 @@ From: Juergen Beisert <jbe@pengutronix.de> -Subject: Check for HAL only, if enabled +Subject: Check for HAL only if hal support is enabled Signed-off-by: Juergen Beisert <jbe@pengutronix.de> --- -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 07/11] xf86-video-fbdev: add fixme 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel ` (4 preceding siblings ...) 2011-10-30 21:56 ` [ptxdist] [PATCH 06/11] " Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 08/11] gtk: clean up Robert Schwebel ` (3 subsequent siblings) 9 siblings, 0 replies; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- .../ignore-timing-option.diff | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/patches/xf86-video-fbdev-0.4.2/ignore-timing-option.diff b/patches/xf86-video-fbdev-0.4.2/ignore-timing-option.diff index 05bd2c8..f39e67c 100644 --- a/patches/xf86-video-fbdev-0.4.2/ignore-timing-option.diff +++ b/patches/xf86-video-fbdev-0.4.2/ignore-timing-option.diff @@ -7,6 +7,7 @@ option to tell X to leave the timing values untouched. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- +FIXME rsc: what's the purpose of this patch? Index: xf86-video-fbdev-0.3.1/src/fbdev.c =================================================================== -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 08/11] gtk: clean up 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel ` (5 preceding siblings ...) 2011-10-30 21:56 ` [ptxdist] [PATCH 07/11] xf86-video-fbdev: add fixme Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 09/11] host-autotools-autoconf: version bump 2.67 -> 2.68 Robert Schwebel ` (2 subsequent siblings) 9 siblings, 0 replies; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- rules/gtk.make | 65 ++++--------------------------------------------------- 1 files changed, 5 insertions(+), 60 deletions(-) diff --git a/rules/gtk.make b/rules/gtk.make index 4ff64a7..95b6c16 100644 --- a/rules/gtk.make +++ b/rules/gtk.make @@ -25,14 +25,6 @@ GTK_SOURCE := $(SRCDIR)/$(GTK).$(GTK_SUFFIX) GTK_DIR := $(BUILDDIR)/$(GTK) # ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(GTK_SOURCE): - @$(call targetinfo) - @$(call get, GTK) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -67,23 +59,11 @@ GTK_AUTOCONF := \ --disable-glibtest \ --disable-modules \ --with-included-loaders=$(subst $(space),$(comma),$(GTK_LOADER-y)) \ - gio_can_sniff=yes - -ifndef PTXCONF_GTK_LOADER_PNG -GTK_AUTOCONF += --without-libpng -endif - -ifndef PTXCONF_GTK_LOADER_TIFF -GTK_AUTOCONF += --without-libtiff -endif - -ifndef PTXCONF_GTK_LOADER_JPEG -GTK_AUTOCONF += --without-libjpeg -endif - -ifndef PTXCONF_GTK_LOADER_JPEG2000 -GTK_AUTOCONF += --without-libjasper -endif + gio_can_sniff=yes \ + --$(call ptx/wwo, PTXCONF_GTK_LOADER_PNG)-libpng \ + --$(call ptx/wwo, PTXCONF_GTK_LOADER_TIFF)-libtiff \ + --$(call ptx/wwo, PTXCONF_GTK_LOADER_JPEG)-libjpeg \ + --$(call ptx/wwo, PTXCONF_GTK_LOADER_JPEG2000)-libjasper ifdef PTXCONF_GTK_TARGET_X11 GTK_AUTOCONF += --with-gdktarget=x11 @@ -123,41 +103,6 @@ $(STATEDIR)/gtk.targetinstall: @$(call install_fixup, gtk,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, gtk,DESCRIPTION,missing) -# reviewed: 2.14.7 wants to install this: -# -# /usr/bin/gdk-pixbuf-csource -# /usr/bin/gtk-update-icon-cache -# /usr/bin/gtk-query-immodules-2.0 -# /usr/bin/gdk-pixbuf-query-loaders -# /usr/bin/gtk-demo -# /usr/bin/gtk-builder-convert -# /usr/share/themes/Default -# /usr/share/themes/Default/gtk-2.0-key -# /usr/share/themes/Default/gtk-2.0-key/gtkrc -# /usr/share/themes/Emacs -# /usr/share/themes/Emacs/gtk-2.0-key -# /usr/share/themes/Emacs/gtk-2.0-key/gtkrc -# /usr/share/themes/Raleigh -# /usr/share/themes/Raleigh/gtk-2.0 -# /usr/share/themes/Raleigh/gtk-2.0/gtkrc -# /usr/lib/libgdk_pixbuf-2.0.so.$(GTK_LIBVERSION) -# /usr/lib/libgdk-directfb-2.0.so -# /usr/lib/gtk-2.0/modules/libferret.so -# /usr/lib/gtk-2.0/modules/libgail.so -# /usr/lib/gtk-2.0/2.10.0/engines/libpixmap.so -# /usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so -# /usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so -# /usr/lib/libgdk_pixbuf-2.0.so.0 -# /usr/lib/libgdk-directfb-2.0.so.0 -# /usr/lib/libgailutil.so.18 -# /usr/lib/libgailutil.so -# /usr/lib/libgdk_pixbuf-2.0.so -# /usr/lib/libgtk-directfb-2.0.so.0 -# /usr/lib/libgdk-directfb-2.0.so.$(GTK_LIBVERSION) -# /usr/lib/libgtk-directfb-2.0.so -# /usr/lib/libgtk-directfb-2.0.so.$(GTK_LIBVERSION) -# /etc/gtk-2.0/im-multipress.conf - ifdef PTXCONF_GTK_TARGET_DIRECTFB @$(call install_lib, gtk, 0, 0, 0644, libgdk-directfb-2.0) @$(call install_lib, gtk, 0, 0, 0644, libgtk-directfb-2.0) -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 09/11] host-autotools-autoconf: version bump 2.67 -> 2.68 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel ` (6 preceding siblings ...) 2011-10-30 21:56 ` [ptxdist] [PATCH 08/11] gtk: clean up Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 10/11] host-autotools-automake: version bump 1.11 -> 1.11.1 Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 11/11] host-autotools-libtool: version bump 2.2.6a -> 2.4.2 Robert Schwebel 9 siblings, 0 replies; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- rules/host-autotools-autoconf.make | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-autotools-autoconf.make b/rules/host-autotools-autoconf.make index ca2ad54..ccde9a6 100644 --- a/rules/host-autotools-autoconf.make +++ b/rules/host-autotools-autoconf.make @@ -16,8 +16,8 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_AUTOCONF) += host-autotools-autoconf # # Paths and names # -HOST_AUTOTOOLS_AUTOCONF_VERSION := 2.67 -HOST_AUTOTOOLS_AUTOCONF_MD5 := 3fbf92eb8eaca1e0d33dff9710edb5f0 +HOST_AUTOTOOLS_AUTOCONF_VERSION := 2.68 +HOST_AUTOTOOLS_AUTOCONF_MD5 := 864d785215aa60d627c91fcb21b05b07 HOST_AUTOTOOLS_AUTOCONF := autoconf-$(HOST_AUTOTOOLS_AUTOCONF_VERSION) HOST_AUTOTOOLS_AUTOCONF_SUFFIX := tar.bz2 HOST_AUTOTOOLS_AUTOCONF_URL := $(PTXCONF_SETUP_GNUMIRROR)/autoconf/$(HOST_AUTOTOOLS_AUTOCONF).$(HOST_AUTOTOOLS_AUTOCONF_SUFFIX) -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 10/11] host-autotools-automake: version bump 1.11 -> 1.11.1 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel ` (7 preceding siblings ...) 2011-10-30 21:56 ` [ptxdist] [PATCH 09/11] host-autotools-autoconf: version bump 2.67 -> 2.68 Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 11/11] host-autotools-libtool: version bump 2.2.6a -> 2.4.2 Robert Schwebel 9 siblings, 0 replies; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- rules/host-autotools-automake.make | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-autotools-automake.make b/rules/host-autotools-automake.make index ad17519..baa737e 100644 --- a/rules/host-autotools-automake.make +++ b/rules/host-autotools-automake.make @@ -16,8 +16,8 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_AUTOMAKE) += host-autotools-automake # # Paths and names # -HOST_AUTOTOOLS_AUTOMAKE_VERSION := 1.11 -HOST_AUTOTOOLS_AUTOMAKE_MD5 := 4db4efe027e26b33930a7e151de19d0f +HOST_AUTOTOOLS_AUTOMAKE_VERSION := 1.11.1 +HOST_AUTOTOOLS_AUTOMAKE_MD5 := c2972c4d9b3e29c03d5f2af86249876f HOST_AUTOTOOLS_AUTOMAKE := automake-$(HOST_AUTOTOOLS_AUTOMAKE_VERSION) HOST_AUTOTOOLS_AUTOMAKE_SUFFIX := tar.bz2 HOST_AUTOTOOLS_AUTOMAKE_URL := $(PTXCONF_SETUP_GNUMIRROR)/automake/$(HOST_AUTOTOOLS_AUTOMAKE).$(HOST_AUTOTOOLS_AUTOMAKE_SUFFIX) -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 11/11] host-autotools-libtool: version bump 2.2.6a -> 2.4.2 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel ` (8 preceding siblings ...) 2011-10-30 21:56 ` [ptxdist] [PATCH 10/11] host-autotools-automake: version bump 1.11 -> 1.11.1 Robert Schwebel @ 2011-10-30 21:56 ` Robert Schwebel 9 siblings, 0 replies; 14+ messages in thread From: Robert Schwebel @ 2011-10-30 21:56 UTC (permalink / raw) To: ptxdist; +Cc: Robert Schwebel Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- rules/host-autotools-libtool.make | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/host-autotools-libtool.make b/rules/host-autotools-libtool.make index cbe4087..330b5fc 100644 --- a/rules/host-autotools-libtool.make +++ b/rules/host-autotools-libtool.make @@ -16,12 +16,12 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_LIBTOOL) += host-autotools-libtool # # Paths and names # -HOST_AUTOTOOLS_LIBTOOL_VERSION := 2.2.6 -HOST_AUTOTOOLS_LIBTOOL_MD5 := 8ca1ea241cd27ff9832e045fe9afe4fd +HOST_AUTOTOOLS_LIBTOOL_VERSION := 2.4.2 +HOST_AUTOTOOLS_LIBTOOL_MD5 := d2f3b7d4627e69e13514a40e72a24d50 HOST_AUTOTOOLS_LIBTOOL := libtool-$(HOST_AUTOTOOLS_LIBTOOL_VERSION) HOST_AUTOTOOLS_LIBTOOL_SUFFIX := tar.gz -HOST_AUTOTOOLS_LIBTOOL_URL := $(PTXCONF_SETUP_GNUMIRROR)/libtool/$(HOST_AUTOTOOLS_LIBTOOL)a.$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX) -HOST_AUTOTOOLS_LIBTOOL_SOURCE := $(SRCDIR)/$(HOST_AUTOTOOLS_LIBTOOL)a.$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX) +HOST_AUTOTOOLS_LIBTOOL_URL := $(PTXCONF_SETUP_GNUMIRROR)/libtool/$(HOST_AUTOTOOLS_LIBTOOL).$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX) +HOST_AUTOTOOLS_LIBTOOL_SOURCE := $(SRCDIR)/$(HOST_AUTOTOOLS_LIBTOOL).$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX) HOST_AUTOTOOLS_LIBTOOL_DIR := $(HOST_BUILDDIR)/$(HOST_AUTOTOOLS_LIBTOOL) HOST_AUTOTOOLS_LIBTOOL_DEVPKG := NO -- 1.7.7 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2011-11-03 14:21 UTC | newest] Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-10-30 21:52 [ptxdist] a Robert Schwebel 2011-10-30 21:54 ` [ptxdist] a few version bumps Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20 Robert Schwebel 2011-11-03 14:21 ` Michael Olbrich 2011-10-30 21:56 ` [ptxdist] [PATCH 03/11] util-linux-ng: clean up package Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 04/11] xorg-server: fix patch documentation Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 05/11] " Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 06/11] " Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 07/11] xf86-video-fbdev: add fixme Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 08/11] gtk: clean up Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 09/11] host-autotools-autoconf: version bump 2.67 -> 2.68 Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 10/11] host-autotools-automake: version bump 1.11 -> 1.11.1 Robert Schwebel 2011-10-30 21:56 ` [ptxdist] [PATCH 11/11] host-autotools-libtool: version bump 2.2.6a -> 2.4.2 Robert Schwebel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox