Re: [ptxdist] Conflicting getline declarations in kernel 2.6.32
* Remy Bohmer li...@bohmer.net [18.01.2010 20:40]:
Hi,
2010/1/18 Frederik Sdun frederik.s...@inotec-licht.de:
Hi,
compiling kernel-headers with a recent host compiler yields the following
error:
scripts/unifdef.c:209: error: conflicting types for 'getline'
/usr/include/stdio.h:651: note: previous declaration of 'getline' was
here
in unifdef.c:
static Linetype getline(void);
in stdio.h:
extern _IO_ssize_t getline (char **__restrict __lineptr,
size_t *__restrict __n,
FILE *__restrict __stream) __wur;
It should only appear on newer systems as mentioned in this article [1].
I attached a patch which applies a patch based on Kyle McMartin's patch.
(HATTRICK)
In later kernels (if I look at 2.6.30 and newer) it has already been
solved, and it has been named get_line() instead of getline().
This is thus not a problem in 2.6.32 any more, but probably it still
is in 2.6.27 as on which your patch in based. So, the subject of this
message is wrong...
See also:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.32.y.git;a=commit;h=d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7
It should only be applied if older kernels are being used. and it
should be preferred the diff from the commit above instead of your
patch.
Kind regards,
Remy
--
ptxdist mailing list
ptxdist@pengutronix.de
Hi,
yes, sorry. It was a little bit confusion because i ran ptxdist twice.
Here's the patch with the upstream patch.
Regards, Frederik
-
Geschäftsführung: Klaus Blankenagel Karl-Heinz Malzahn
Sitz der Gesellschaft: Ense
Amtsgericht: Arnsberg HRB 4452
Diese Nachricht ist als vertraulich einzustufen. Sollten Sie nicht der
vorgesehene Empfänger sein, bitten wir Sie höflich um eine kurze
Mitteilung und um die Löschung dieser Nachricht.
Jede unbefugte Weiterleitung oder Fertigung einer Kopie ist unzulässig.
Diese Nachricht dient lediglich dem Austausch von Informationen und
entfaltet keine rechtliche Bindungswirkung. Aufgrund der leichten
Manipulierbarkeit von E-Mails können wir keine Haftung für den Inhalt
übernehmen.
-
management: Klaus Blankenagel Karl-Heinz Malzahn
based in:Ense
competent country court: Arnsberg HRB 4452
This message is confidential and may be privileged. If you are not
the intended recipient, we kindly ask you to inform the sender and
delete this message.
Any authorised dissemination or copying hereof is prohibited.
This message servers for information purposes only and shall not
have any legally binding effect. Given that e-mails can easily be
subject to manipulation, we can not accept any liability for the
content provided.
From eefe956d32f539f9ae0772c8e41afd47786a3ed9 Mon Sep 17 00:00:00 2001
From: Frederik Sdun frederik.s...@inotec-licht.de
Date: Mon, 18 Jan 2010 14:44:08 +0100
Subject: [PATCH] linux-2.6.27: Add patch to rename getline to get_line
Signed-off-by: Frederik Sdun frederik.s...@inotec-licht.de
---
patches/linux-2.6.27/series |1 +
patches/linux-2.6.27/unifdef.c.patch | 33 +
2 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/patches/linux-2.6.27/series b/patches/linux-2.6.27/series
new file mode 100644
index 000..3c93e68
--- /dev/null
+++ b/patches/linux-2.6.27/series
@@ -0,0 +1 @@
+unifdef.c.patch
diff --git a/patches/linux-2.6.27/unifdef.c.patch b/patches/linux-2.6.27/unifdef.c.patch
new file mode 100644
index 000..6af3994
--- /dev/null
+++ b/patches/linux-2.6.27/unifdef.c.patch
@@ -0,0 +1,33 @@
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-2.6.32.y.git;a=blobdiff_plain;f=scripts%2Funifdef.c;h=05a31a6c7e1bbda6537dd313e6498abedabbc4ca;hp=552025e72acb1341923bfb471547189419567844;hb=d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7;hpb=559595a985e106d2fa9f0c79b7f5805453fed593
+
+diff --git a/scripts/unifdef.c b/scripts/unifdef.c
+index 552025e..05a31a6 100644
+--- a/scripts/unifdef.c
b/scripts/unifdef.c
+@@ -206,7 +206,7 @@ static void done(void);
+ static void error(const char *);
+ static int findsym(const char *);
+ static void flushline(bool);
+-static Linetype getline(void);
++static Linetype get_line(void);
+ static Linetype ifeval(const char **);
+ static void ignoreoff(void);
+ static void ignoreon(void);
+@@ -512,7 +512,7 @@ process(void)
+
+ for (;;) {
+ linenum++;
+- lineval = getline();
++ lineval = get_line();
+ trans_table[ifstate[depth]][lineval]();
+ debug(process %s - %s depth %d,
+ linetype_name[lineval],
+@@ -526,7 +526,7 @@ process(void)
+ * help from skipcomment().
+ */
+ static Linetype
+-getline(void)
++get_line(void)
+ {
+ const char *cp;
+ int cursym;
--
[ptxdist] [PATCH 01/10] [host-libuuid] Added virtual package
From: Carsten Schlote c.schl...@konzeptpark.de Currently HOST_E2FSPROGS is selected for those host tools, who need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual host package 'host-libuuid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-libuuid.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 rules/host-libuuid.in diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in new file mode 100644 index 000..53731b0 --- /dev/null +++ b/rules/host-libuuid.in @@ -0,0 +1,12 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBUUID + tristate + select HOST_E2FSPROGS + help + Helper to select the host packet containing a recent libuuid.so + library and its header. + + The following packages provide libuuid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 02/10] [host-libblkid] Added virtual package
From: Carsten Schlote c.schl...@konzeptpark.de Currently HOST_E2FSPROGS is selected for those host tools, who need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual host package 'host-libblkid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-libblkid.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 rules/host-libblkid.in diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in new file mode 100644 index 000..62c463b --- /dev/null +++ b/rules/host-libblkid.in @@ -0,0 +1,12 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBBLKID + tristate + select HOST_E2FSPROGS + help + Helper to select the host packet containing a recent libblkid.so + library and its header. + + The following packages provide libblkid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 03/10] [host-mtd-utils] Fixup dep to libuuid
From: Carsten Schlote c.schl...@konzeptpark.de Selects virtual package for libuuid.so, which is required for the ubifs tools. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-mtd-utils.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in index 2e501c0..9636aea 100644 --- a/rules/host-mtd-utils.in +++ b/rules/host-mtd-utils.in @@ -4,4 +4,4 @@ config HOST_MTD_UTILS tristate select HOST_LIBLZO select HOST_ZLIB - select HOST_E2FSPROGS + select HOST_LIBUUID -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 04/10] [libuuid] Added virtual package
From: Carsten Schlote c.schl...@konzeptpark.de Currently E2FSPROGS is selected for those target packages, which need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual package 'libuuid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/libuuid.in | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 rules/libuuid.in diff --git a/rules/libuuid.in b/rules/libuuid.in new file mode 100644 index 000..b603af1 --- /dev/null +++ b/rules/libuuid.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config LIBUUID + tristate + prompt libuuid + select E2FSPROGS + help + Helper to select the target packet containing a recent libuuid.so + library and its header. + + The following packages provide libuuid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 06/10] [host-util-linux-ng] Added host build for newer libuuid and libblkid
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libuuid and libblkid then the e2fsprogs. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-util-linux-ng.in |8 ++ rules/host-util-linux-ng.make | 54 + 2 files changed, 62 insertions(+), 0 deletions(-) create mode 100644 rules/host-util-linux-ng.in create mode 100644 rules/host-util-linux-ng.make diff --git a/rules/host-util-linux-ng.in b/rules/host-util-linux-ng.in new file mode 100644 index 000..b457267 --- /dev/null +++ b/rules/host-util-linux-ng.in @@ -0,0 +1,8 @@ +## SECTION=hosttools + +config HOST_UTIL_LINUX_NG + tristate + prompt util-linux-ng (host libs) + select HOST_GETTEXT + help + Useful hosttools and libs for linux ng utils. diff --git a/rules/host-util-linux-ng.make b/rules/host-util-linux-ng.make new file mode 100644 index 000..748a23a --- /dev/null +++ b/rules/host-util-linux-ng.make @@ -0,0 +1,54 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_UTIL_LINUX_NG) += host-util-linux-ng + +# +# Paths and names +# +HOST_UTIL_LINUX_NG_DIR = $(HOST_BUILDDIR)/$(UTIL_LINUX_NG) + +# +# Get +# + +$(STATEDIR)/host-util-linux-ng.get: $(STATEDIR)/util-linux-ng.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-util-linux-ng.extract: + @$(call targetinfo) + @$(call clean, $(HOST_UTIL_LINUX_NG_DIR)) + @$(call extract, UTIL_LINUX_NG, $(HOST_BUILDDIR)) + @$(call patchin, UTIL_LINUX_NG, $(HOST_UTIL_LINUX_NG_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_UTIL_LINUX_NG_PATH:= PATH=$(HOST_PATH) +HOST_UTIL_LINUX_NG_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_UTIL_LINUX_NG_AUTOCONF:= $(HOST_AUTOCONF) \ + --disable-use-tty-group \ + --disable-makeinstall-chown + +# vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 10/10] (4/4) Switch to newer versions of libuuid and libblkid
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch modifies the virtual host packages for the transition. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-libblkid.in |2 +- rules/host-libuuid.in |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in index 62c463b..31490b7 100644 --- a/rules/host-libblkid.in +++ b/rules/host-libblkid.in @@ -2,7 +2,7 @@ config HOST_LIBBLKID tristate - select HOST_E2FSPROGS + select HOST_UTIL_LINUX_NG help Helper to select the host packet containing a recent libblkid.so library and its header. diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in index 53731b0..f88e79f 100644 --- a/rules/host-libuuid.in +++ b/rules/host-libuuid.in @@ -2,7 +2,7 @@ config HOST_LIBUUID tristate - select HOST_E2FSPROGS + select HOST_UTIL_LINUX_NG help Helper to select the host packet containing a recent libuuid.so library and its header. -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 07/10] (1/4) Switch to newer versions of libuuid and libblkid
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch prepares transition by redirecting selects for libuuid or libblkid to virtual packages. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/btrfs-progs.in|2 +- rules/mtd-utils.in |2 +- rules/networkmanager.in |4 +--- rules/nfsutils.in |3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/rules/btrfs-progs.in b/rules/btrfs-progs.in index 8d297d5..b91d0c3 100644 --- a/rules/btrfs-progs.in +++ b/rules/btrfs-progs.in @@ -5,7 +5,7 @@ config BTRFS_PROGS select E2FSPROGS select E2FSPROGS_LIBCOM_ERR select E2FSPROGS_LIBEXT2FS - select E2FSPROGS_LIBUUID + select LIBUUID select ZLIB prompt btrfs-progs help diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in index 6aaf9fc..21e7ff4 100644 --- a/rules/mtd-utils.in +++ b/rules/mtd-utils.in @@ -4,7 +4,7 @@ menuconfig MTD_UTILS tristate prompt mtd-utils select ZLIB - select E2FSPROGS + select LIBUUID select LIBLZO if MTD_UTILS_USE_LIBLZO help Memory Technology Device Utilities diff --git a/rules/networkmanager.in b/rules/networkmanager.in index 94b7163..744a03d 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -6,9 +6,7 @@ config NETWORKMANAGER select WIRELESS select DBUS_GLIB select LIBNL - # we need libuuid from e2fsprogs - select E2FSPROGS - select E2FSPROGS_LIBUUID + select LIBUUID # FIXME: hal can be configured without policy-kit, but networkmanager depends on it select HAL select HAL__POLKIT diff --git a/rules/nfsutils.in b/rules/nfsutils.in index 09f7c2d..b24c1b3 100644 --- a/rules/nfsutils.in +++ b/rules/nfsutils.in @@ -2,8 +2,7 @@ menuconfig NFSUTILS tristate # we need libblkid - select E2FSPROGS - select E2FSPROGS_LIBBLKID + select LIBBLKID select TCPWRAPPER if NFSUTILS_WITH_TCPWRAPPERS prompt nfsutils help -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 08/10] (2/4) Switch to newer versions of libuuid and libblkid
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch modifies e2fsprogs and util-linux-ng: - Disable compilation of built-in libs in e2fsprogs - Remove selects for e2fsprogs from utils-linux-ng - Moved installtion of libs to ng-utils - Commented out blkid and uuidgen from e2fsprogs to avoid collisions. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/e2fsprogs.in | 32 +--- rules/e2fsprogs.make | 41 ++--- rules/util-linux-ng.in | 33 ++--- rules/util-linux-ng.make | 20 4 files changed, 85 insertions(+), 41 deletions(-) diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in index 825d287..13d831d 100644 --- a/rules/e2fsprogs.in +++ b/rules/e2fsprogs.in @@ -4,6 +4,8 @@ menuconfig E2FSPROGS tristate prompt e2fsprogs select HOST_GETTEXT + select LIBBLKID if E2FSPROGS_LIBBLKID + select LIBUUID if E2FSPROGS_LIBUUID help The e2fsprogs package provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3 filesystem @@ -105,12 +107,12 @@ config E2FSPROGS_INSTALL_LSATTR help Enable support for lsattr program. -config E2FSPROGS_INSTALL_UUIDGEN - bool - select E2FSPROGS_LIBUUID - prompt uuidgen - help - Enable support for uuidgen program. +#config E2FSPROGS_INSTALL_UUIDGEN +# bool +# select E2FSPROGS_LIBUUID +# prompt uuidgen +# help +#Enable support for uuidgen program. # - @@ -122,15 +124,15 @@ config E2FSPROGS_INSTALL_BADBLOCKS help Enable support for badblocks program. -config E2FSPROGS_INSTALL_BLKID - bool - select E2FSPROGS_LIBBLKID - select E2FSPROGS_LIBCOM_ERR - select E2FSPROGS_LIBEXT2FS - select E2FSPROGS_LIBUUID - prompt blkid - help - Enable support for blkid program. +#config E2FSPROGS_INSTALL_BLKID +# bool +# select E2FSPROGS_LIBBLKID +# select E2FSPROGS_LIBCOM_ERR +# select E2FSPROGS_LIBEXT2FS +# select E2FSPROGS_LIBUUID +# prompt blkid +# help +#Enable support for blkid program. config E2FSPROGS_INSTALL_DUMPE2FS bool diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index f8079bd..2ab9fd6 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -56,7 +56,9 @@ E2FSPROGS_AUTOCONF := \ --disable-testio-debug \ --disable-tls \ --enable-elf-shlibs \ - --enable-htree + --enable-htree \ + --disable-libblkid \ + --disable-libuuid ifdef PTXCONF_E2FSPROGS_COMPRESSION E2FSPROGS_AUTOCONF += --enable-compression @@ -109,12 +111,13 @@ $(STATEDIR)/e2fsprogs.targetinstall: # # # # libraries # # -ifdef PTXCONF_E2FSPROGS_LIBBLKID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libblkid.so.1.0) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) -endif + +#ifdef PTXCONF_E2FSPROGS_LIBBLKID +# @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ +# /usr/lib/libblkid.so.1.0) +# @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) +# @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) +#endif ifdef PTXCONF_E2FSPROGS_LIBCOM_ERR @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ @@ -144,12 +147,12 @@ ifdef PTXCONF_E2FSPROGS_LIBSS @$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so) endif -ifdef PTXCONF_E2FSPROGS_LIBUUID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libuuid.so.1.2) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so) -endif +#ifdef PTXCONF_E2FSPROGS_LIBUUID +# @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ +# /usr/lib/libuuid.so.1.2) +# @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1) +# @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so) +#endif # # @@ -161,9 +164,9 @@ endif ifdef PTXCONF_E2FSPROGS_INSTALL_LSATTR @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/lsattr) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) -endif +#ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN +# @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) +#endif # # @@ -173,9 +176,9 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/badblocks)
Re: [ptxdist] Updated libuuid and libblkid
Carsten Schlote wrote: There are newer versions of libuuid and libblkid available in util-linux-ng. It includes also the blkid and uuidgen binaries. As a newer version was a requirement for some other updated tool, I changed the .in files to switch over to these new libs. Ideally there should be stand-alone packages for both libraries, but I couldn't find stand-alone sources yet. To ease later migration I added .in configs for both libs to select the right packages. So packages can select just (HOST_) LIBUUID or LIBBLKID as depends. nice, cool idea. The old code in e2fsprogs is commented out, so mixed installation of libs and binaries from both e2fsprogs and util-linux.ng is avoid. Internal libs are disabled by autoconf for e2fsprogs. please just remove the code, we've got git if we want to get the old source back. see more comments in the individual patches inline cheers, Marc Carsten [host-libuuid] Added virtual package [host-libblkid] Added virtual package [host-mtd-utils] Fixup dep to libuuid [libuuid] Added virtual package [libblkid] Added virtual package [host-util-linux-ng] Added host build for newer libuuid and libblkid [ptxdist] (1/4) Switch to newer versions of libuuid and libblkid [ptxdist] (2/4) Switch to newer versions of libuuid and libblkid [ptxdist] (3/4) Switch to newer versions of libuuid and libblkid [ptxdist] (4/4) Switch to newer versions of libuuid and libblkid -- ptxdist mailing list ptxdist@pengutronix.de -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 02/10] [host-libblkid] Added virtual package
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Currently HOST_E2FSPROGS is selected for those host tools, who need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual host package 'host-libblkid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-libblkid.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 rules/host-libblkid.in diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in new file mode 100644 index 000..62c463b --- /dev/null +++ b/rules/host-libblkid.in @@ -0,0 +1,12 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBBLKID + tristate + select HOST_E2FSPROGS + help + Helper to select the host packet containing a recent libblkid.so + library and its header. + + The following packages provide libblkid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 03/10] [host-mtd-utils] Fixup dep to libuuid
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Selects virtual package for libuuid.so, which is required for the ubifs tools. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-mtd-utils.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in index 2e501c0..9636aea 100644 --- a/rules/host-mtd-utils.in +++ b/rules/host-mtd-utils.in @@ -4,4 +4,4 @@ config HOST_MTD_UTILS tristate select HOST_LIBLZO select HOST_ZLIB - select HOST_E2FSPROGS + select HOST_LIBUUID -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 04/10] [libuuid] Added virtual package
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Currently E2FSPROGS is selected for those target packages, which need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual package 'libuuid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/libuuid.in | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 rules/libuuid.in diff --git a/rules/libuuid.in b/rules/libuuid.in new file mode 100644 index 000..b603af1 --- /dev/null +++ b/rules/libuuid.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config LIBUUID + tristate + prompt libuuid + select E2FSPROGS this is not enough, please select the E2FSPROGS_LIBUUID Marc + help + Helper to select the target packet containing a recent libuuid.so + library and its header. + + The following packages provide libuuid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 05/10] [libblkid] Added virtual package
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Currently E2FSPROGS is selected for those target packages, which need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual package 'libblkid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/libblkid.in | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 rules/libblkid.in diff --git a/rules/libblkid.in b/rules/libblkid.in new file mode 100644 index 000..c3d873c --- /dev/null +++ b/rules/libblkid.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config LIBBLKID + tristate + prompt libblkid + select E2FSPROGS please select the E2FSPROGS_LIBBLKID, too Marc + help + Helper to select the target packet containing a recent libblkid.so + library and its header. + + The following packages provide libblkid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 08/10] (2/4) Switch to newer versions of libuuid and libblkid
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch modifies e2fsprogs and util-linux-ng: - Disable compilation of built-in libs in e2fsprogs - Remove selects for e2fsprogs from utils-linux-ng - Moved installtion of libs to ng-utils - Commented out blkid and uuidgen from e2fsprogs to avoid collisions. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/e2fsprogs.in | 32 +--- rules/e2fsprogs.make | 41 ++--- rules/util-linux-ng.in | 33 ++--- rules/util-linux-ng.make | 20 4 files changed, 85 insertions(+), 41 deletions(-) diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in index 825d287..13d831d 100644 --- a/rules/e2fsprogs.in +++ b/rules/e2fsprogs.in @@ -4,6 +4,8 @@ menuconfig E2FSPROGS tristate prompt e2fsprogs select HOST_GETTEXT + select LIBBLKID if E2FSPROGS_LIBBLKID + select LIBUUID if E2FSPROGS_LIBUUID please add a tab before the if and one space after it help The e2fsprogs package provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3 filesystem @@ -105,12 +107,12 @@ config E2FSPROGS_INSTALL_LSATTR help Enable support for lsattr program. -config E2FSPROGS_INSTALL_UUIDGEN - bool - select E2FSPROGS_LIBUUID - prompt uuidgen - help - Enable support for uuidgen program. +#config E2FSPROGS_INSTALL_UUIDGEN +#bool +#select E2FSPROGS_LIBUUID +#prompt uuidgen +#help +# Enable support for uuidgen program. please remove the code entirely. # - @@ -122,15 +124,15 @@ config E2FSPROGS_INSTALL_BADBLOCKS help Enable support for badblocks program. -config E2FSPROGS_INSTALL_BLKID - bool - select E2FSPROGS_LIBBLKID - select E2FSPROGS_LIBCOM_ERR - select E2FSPROGS_LIBEXT2FS - select E2FSPROGS_LIBUUID - prompt blkid - help - Enable support for blkid program. +#config E2FSPROGS_INSTALL_BLKID +#bool +#select E2FSPROGS_LIBBLKID +#select E2FSPROGS_LIBCOM_ERR +#select E2FSPROGS_LIBEXT2FS +#select E2FSPROGS_LIBUUID +#prompt blkid +#help +# Enable support for blkid program. please remove the code entirely. config E2FSPROGS_INSTALL_DUMPE2FS bool diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index f8079bd..2ab9fd6 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -56,7 +56,9 @@ E2FSPROGS_AUTOCONF := \ --disable-testio-debug \ --disable-tls \ --enable-elf-shlibs \ - --enable-htree + --enable-htree \ + --disable-libblkid \ + --disable-libuuid ifdef PTXCONF_E2FSPROGS_COMPRESSION E2FSPROGS_AUTOCONF += --enable-compression @@ -109,12 +111,13 @@ $(STATEDIR)/e2fsprogs.targetinstall: ## ## libraries ## -ifdef PTXCONF_E2FSPROGS_LIBBLKID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libblkid.so.1.0) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) -endif + +#ifdef PTXCONF_E2FSPROGS_LIBBLKID +#@$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ +#/usr/lib/libblkid.so.1.0) +#@$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) +#@$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) +#endif please remove the code entirely. ifdef PTXCONF_E2FSPROGS_LIBCOM_ERR @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ @@ -144,12 +147,12 @@ ifdef PTXCONF_E2FSPROGS_LIBSS @$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so) endif -ifdef PTXCONF_E2FSPROGS_LIBUUID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libuuid.so.1.2) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so) -endif +#ifdef PTXCONF_E2FSPROGS_LIBUUID +#@$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ +#/usr/lib/libuuid.so.1.2) +#@$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1) +#@$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so) +#endif please remove the code entirely. ## @@ -161,9 +164,9 @@ endif ifdef PTXCONF_E2FSPROGS_INSTALL_LSATTR @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/lsattr) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) -endif +#ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN +#@$(call
Re: [ptxdist] [PATCH 09/10] (3/4) Switch to newer versions of libuuid and libblkid
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch modifies the virtual packages for the transition. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/libblkid.in |3 ++- rules/libuuid.in |3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/libblkid.in b/rules/libblkid.in index c3d873c..aad2230 100644 --- a/rules/libblkid.in +++ b/rules/libblkid.in @@ -3,7 +3,8 @@ config LIBBLKID tristate prompt libblkid - select E2FSPROGS + select UTIL_LINUX_NG + select UTIL_LINUX_NG_LIBBLKID help Helper to select the target packet containing a recent libblkid.so library and its header. diff --git a/rules/libuuid.in b/rules/libuuid.in index b603af1..e2cca68 100644 --- a/rules/libuuid.in +++ b/rules/libuuid.in @@ -3,7 +3,8 @@ config LIBUUID tristate prompt libuuid - select E2FSPROGS + select UTIL_LINUX_NG + select UTIL_LINUX_NG_LIBUUID help Helper to select the target packet containing a recent libuuid.so library and its header. -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [v2]] Updated libuuid and libblkid
Version 2 of patchstack including review changes. Carsten -- There are newer versions of libuuid and libblkid available in util-linux-ng. It includes also the blkid and uuidgen binaries. As a newer version was a requirement for some other updated tool, I changed the .in files to switch over to these new libs. Ideally there should be stand-alone packages for both libraries, but I couldn't find stand-alone sources yet. To ease later migration I added .in configs for both libs to select the right packages. So packages can select just (HOST_) LIBUUID or LIBBLKID as depends. The old code in e2fsprogs was removed, so mixed installation of libs and binaries from both e2fsprogs and util-linux.ng is avoid. Internal libs are disabled by autoconf for e2fsprogs. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 02/10] [host-libblkid] Added virtual package
From: Carsten Schlote c.schl...@konzeptpark.de Currently HOST_E2FSPROGS is selected for those host tools, who need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual host package 'host-libblkid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-libblkid.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 rules/host-libblkid.in diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in new file mode 100644 index 000..62c463b --- /dev/null +++ b/rules/host-libblkid.in @@ -0,0 +1,12 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBBLKID + tristate + select HOST_E2FSPROGS + help + Helper to select the host packet containing a recent libblkid.so + library and its header. + + The following packages provide libblkid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 03/10] [host-mtd-utils] Fixup dep to libuuid
From: Carsten Schlote c.schl...@konzeptpark.de Selects virtual package for libuuid.so, which is required for the ubifs tools. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-mtd-utils.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in index 2e501c0..9636aea 100644 --- a/rules/host-mtd-utils.in +++ b/rules/host-mtd-utils.in @@ -4,4 +4,4 @@ config HOST_MTD_UTILS tristate select HOST_LIBLZO select HOST_ZLIB - select HOST_E2FSPROGS + select HOST_LIBUUID -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 06/10] [host-util-linux-ng] Added host build for newer libuuid and libblkid
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libuuid and libblkid then the e2fsprogs. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-util-linux-ng.in |8 +++ rules/host-util-linux-ng.make | 42 + 2 files changed, 50 insertions(+), 0 deletions(-) create mode 100644 rules/host-util-linux-ng.in create mode 100644 rules/host-util-linux-ng.make diff --git a/rules/host-util-linux-ng.in b/rules/host-util-linux-ng.in new file mode 100644 index 000..b457267 --- /dev/null +++ b/rules/host-util-linux-ng.in @@ -0,0 +1,8 @@ +## SECTION=hosttools + +config HOST_UTIL_LINUX_NG + tristate + prompt util-linux-ng (host libs) + select HOST_GETTEXT + help + Useful hosttools and libs for linux ng utils. diff --git a/rules/host-util-linux-ng.make b/rules/host-util-linux-ng.make new file mode 100644 index 000..448f3d2 --- /dev/null +++ b/rules/host-util-linux-ng.make @@ -0,0 +1,42 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_UTIL_LINUX_NG) += host-util-linux-ng + +# +# Paths and names +# +HOST_UTIL_LINUX_NG_DIR = $(HOST_BUILDDIR)/$(UTIL_LINUX_NG) + +# +# Get +# + +$(STATEDIR)/host-util-linux-ng.get: $(STATEDIR)/util-linux-ng.get + @$(call targetinfo) + @$(call touch) + +# +# Prepare +# + +# +# autoconf +# + +HOST_UTIL_LINUX_NG_AUTOCONF := \ + $(HOST_AUTOCONF) \ + --disable-use-tty-group \ + --disable-makeinstall-chown + +# vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 01/10] [host-libuuid] Added virtual package
From: Carsten Schlote c.schl...@konzeptpark.de Currently HOST_E2FSPROGS is selected for those host tools, who need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual host package 'host-libuuid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-libuuid.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 rules/host-libuuid.in diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in new file mode 100644 index 000..53731b0 --- /dev/null +++ b/rules/host-libuuid.in @@ -0,0 +1,12 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBUUID + tristate + select HOST_E2FSPROGS + help + Helper to select the host packet containing a recent libuuid.so + library and its header. + + The following packages provide libuuid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 06/10] [host-util-linux-ng] Added host build for newer libuuid and libblkid
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libuuid and libblkid then the e2fsprogs. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-util-linux-ng.in |8 +++ rules/host-util-linux-ng.make | 42 + 2 files changed, 50 insertions(+), 0 deletions(-) create mode 100644 rules/host-util-linux-ng.in create mode 100644 rules/host-util-linux-ng.make diff --git a/rules/host-util-linux-ng.in b/rules/host-util-linux-ng.in new file mode 100644 index 000..b457267 --- /dev/null +++ b/rules/host-util-linux-ng.in @@ -0,0 +1,8 @@ +## SECTION=hosttools + +config HOST_UTIL_LINUX_NG + tristate + prompt util-linux-ng (host libs) + select HOST_GETTEXT + help + Useful hosttools and libs for linux ng utils. diff --git a/rules/host-util-linux-ng.make b/rules/host-util-linux-ng.make new file mode 100644 index 000..448f3d2 --- /dev/null +++ b/rules/host-util-linux-ng.make @@ -0,0 +1,42 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_UTIL_LINUX_NG) += host-util-linux-ng + +# +# Paths and names +# +HOST_UTIL_LINUX_NG_DIR = $(HOST_BUILDDIR)/$(UTIL_LINUX_NG) + +# +# Get +# + +$(STATEDIR)/host-util-linux-ng.get: $(STATEDIR)/util-linux-ng.get + @$(call targetinfo) + @$(call touch) + +# +# Prepare +# + +# +# autoconf +# + +HOST_UTIL_LINUX_NG_AUTOCONF := \ + $(HOST_AUTOCONF) \ + --disable-use-tty-group \ + --disable-makeinstall-chown ^^ please use a tab, no spaces Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 10/10] (4/4) Switch to newer versions of libuuid and libblkid
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch modifies the virtual host packages for the transition. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-libblkid.in |2 +- rules/host-libuuid.in |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in index 62c463b..31490b7 100644 --- a/rules/host-libblkid.in +++ b/rules/host-libblkid.in @@ -2,7 +2,7 @@ config HOST_LIBBLKID tristate - select HOST_E2FSPROGS + select HOST_UTIL_LINUX_NG help Helper to select the host packet containing a recent libblkid.so library and its header. diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in index 53731b0..f88e79f 100644 --- a/rules/host-libuuid.in +++ b/rules/host-libuuid.in @@ -2,7 +2,7 @@ config HOST_LIBUUID tristate - select HOST_E2FSPROGS + select HOST_UTIL_LINUX_NG help Helper to select the host packet containing a recent libuuid.so library and its header. -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 04/10] [libuuid] Added virtual package
On Wed, Jan 20, 2010 at 02:46:36PM +0100, Carsten Schlote wrote: I'm thinking about removing the prompt. mol what do you think? Currently it is a more meaningful placeholder and redirect for libuuid. So, it should work without. OTOH it might be desireable to see it in the menuconfig as some help for ptxdist newbees. If they add their first package and need it, they know what to select from the menu. ptxdist nerds propably use grep or check /rules for some .in file :-) A ptxdist newbie won't find it in the menu either. There is just too much stuff. And with a prompt it will remain enabled when the last package selecting it is disabled. So I vote for no prompt. 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- | -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [v3] Updated libuuid and libblkid
Version 3 of patchstack including review changes. Applies against latest master branch. Carsten -- There are newer versions of libuuid and libblkid available in util-linux-ng. It includes also the blkid and uuidgen binaries. As a newer version was a requirement for some other updated tool, I changed the .in files to switch over to these new libs. Ideally there should be stand-alone packages for both libraries, but I couldn't find stand-alone sources yet. To ease later migration I added .in configs for both libs to select the right packages. So packages can select just (HOST_) LIBUUID or LIBBLKID as depends. The old code in e2fsprogs was removed, so mixed installation of libs and binaries from both e2fsprogs and util-linux.ng is avoid. Internal libs are disabled by autoconf for e2fsprogs. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 02/10] [host-libblkid] Added virtual package
From: Carsten Schlote c.schl...@konzeptpark.de Currently HOST_E2FSPROGS is selected for those host tools, who need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual host package 'host-libblkid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-libblkid.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 rules/host-libblkid.in diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in new file mode 100644 index 000..62c463b --- /dev/null +++ b/rules/host-libblkid.in @@ -0,0 +1,12 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBBLKID + tristate + select HOST_E2FSPROGS + help + Helper to select the host packet containing a recent libblkid.so + library and its header. + + The following packages provide libblkid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 04/10] [libuuid] Added virtual package
From: Carsten Schlote c.schl...@konzeptpark.de Currently E2FSPROGS is selected for those target packages, which need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual package 'libuuid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/libuuid.in | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 rules/libuuid.in diff --git a/rules/libuuid.in b/rules/libuuid.in new file mode 100644 index 000..8134ee6 --- /dev/null +++ b/rules/libuuid.in @@ -0,0 +1,14 @@ +## SECTION=system_libraries + +config LIBUUID + tristate + prompt libuuid + select E2FSPROGS + select E2FSPROGS_LIBUUID + help + Helper to select the target packet containing a recent libuuid.so + library and its header. + + The following packages provide libuuid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 08/10] (2/4) Switch to newer versions of libuuid and libblkid
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch modifies e2fsprogs and util-linux-ng: - Disable compilation of built-in libs in e2fsprogs - Remove selects for e2fsprogs from utils-linux-ng - Moved installtion of libs to ng-utils - Commented out blkid and uuidgen from e2fsprogs to avoid collisions. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/e2fsprogs.in | 18 ++ rules/e2fsprogs.make | 25 +++-- rules/util-linux-ng.in | 33 ++--- rules/util-linux-ng.make | 20 4 files changed, 51 insertions(+), 45 deletions(-) diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in index 825d287..4fc9899 100644 --- a/rules/e2fsprogs.in +++ b/rules/e2fsprogs.in @@ -4,6 +4,8 @@ menuconfig E2FSPROGS tristate prompt e2fsprogs select HOST_GETTEXT + select LIBBLKID if E2FSPROGS_LIBBLKID + select LIBUUID if E2FSPROGS_LIBUUID help The e2fsprogs package provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3 filesystem @@ -105,13 +107,6 @@ config E2FSPROGS_INSTALL_LSATTR help Enable support for lsattr program. -config E2FSPROGS_INSTALL_UUIDGEN - bool - select E2FSPROGS_LIBUUID - prompt uuidgen - help - Enable support for uuidgen program. - # - config E2FSPROGS_INSTALL_BADBLOCKS @@ -122,15 +117,6 @@ config E2FSPROGS_INSTALL_BADBLOCKS help Enable support for badblocks program. -config E2FSPROGS_INSTALL_BLKID - bool - select E2FSPROGS_LIBBLKID - select E2FSPROGS_LIBCOM_ERR - select E2FSPROGS_LIBEXT2FS - select E2FSPROGS_LIBUUID - prompt blkid - help - Enable support for blkid program. config E2FSPROGS_INSTALL_DUMPE2FS bool diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index f8079bd..36fd6c7 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -56,7 +56,9 @@ E2FSPROGS_AUTOCONF := \ --disable-testio-debug \ --disable-tls \ --enable-elf-shlibs \ - --enable-htree + --enable-htree \ + --disable-libblkid \ + --disable-libuuid ifdef PTXCONF_E2FSPROGS_COMPRESSION E2FSPROGS_AUTOCONF += --enable-compression @@ -109,12 +111,6 @@ $(STATEDIR)/e2fsprogs.targetinstall: # # # # libraries # # -ifdef PTXCONF_E2FSPROGS_LIBBLKID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libblkid.so.1.0) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) -endif ifdef PTXCONF_E2FSPROGS_LIBCOM_ERR @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ @@ -144,14 +140,6 @@ ifdef PTXCONF_E2FSPROGS_LIBSS @$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so) endif -ifdef PTXCONF_E2FSPROGS_LIBUUID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libuuid.so.1.2) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so) -endif - - # # # # binaries in /usr/bin # # @@ -161,9 +149,6 @@ endif ifdef PTXCONF_E2FSPROGS_INSTALL_LSATTR @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/lsattr) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) -endif # # @@ -173,10 +158,6 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/badblocks) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/blkid) -endif - ifdef PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/dumpe2fs) endif diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index da3d749..eacd405 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -4,16 +4,19 @@ menuconfig UTIL_LINUX_NG tristate prompt util-linux-ng select HOST_GETTEXT - # select LIBC_UTIL - # we may need libuuid from E2FSPROGS, but we always need blkid - select E2FSPROGS - select E2FSPROGS_LIBBLKID - select E2FSPROGS_LIBUUIDif UTIL_LINUX_NG_MKSWAP_UUID - select NCURSES if UTIL_LINUX_NG_USES_NCURSES - select UTIL_LINUX_NG_USES_NCURSES if UTIL_LINUX_NG_CFDISK || UTIL_LINUX_NG_SETTERM + select UTIL_LINUX_NG_LIBBLKID + select UTIL_LINUX_NG_LIBUUIDif UTIL_LINUX_NG_MKSWAP_UUID + select NCURSES if UTIL_LINUX_NG_USES_NCURSES
[ptxdist] [PATCH 10/10] (4/4) Switch to newer versions of libuuid and libblkid
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch modifies the virtual host packages for the transition. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-libblkid.in |2 +- rules/host-libuuid.in |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in index 62c463b..31490b7 100644 --- a/rules/host-libblkid.in +++ b/rules/host-libblkid.in @@ -2,7 +2,7 @@ config HOST_LIBBLKID tristate - select HOST_E2FSPROGS + select HOST_UTIL_LINUX_NG help Helper to select the host packet containing a recent libblkid.so library and its header. diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in index 53731b0..f88e79f 100644 --- a/rules/host-libuuid.in +++ b/rules/host-libuuid.in @@ -2,7 +2,7 @@ config HOST_LIBUUID tristate - select HOST_E2FSPROGS + select HOST_UTIL_LINUX_NG help Helper to select the host packet containing a recent libuuid.so library and its header. -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 07/10] (1/4) Switch to newer versions of libuuid and libblkid
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch prepares transition by redirecting selects for libuuid or libblkid to virtual packages. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/mtd-utils.in |2 +- rules/networkmanager.in |4 +--- rules/nfsutils.in |3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in index 7caad2e..6ca5513 100644 --- a/rules/mtd-utils.in +++ b/rules/mtd-utils.in @@ -4,7 +4,7 @@ menuconfig MTD_UTILS tristate prompt mtd-utils select ZLIB - select E2FSPROGS + select LIBUUID select LIBLZO if MTD_UTILS_USE_LIBLZO help Memory Technology Device Utilities diff --git a/rules/networkmanager.in b/rules/networkmanager.in index 94b7163..744a03d 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -6,9 +6,7 @@ config NETWORKMANAGER select WIRELESS select DBUS_GLIB select LIBNL - # we need libuuid from e2fsprogs - select E2FSPROGS - select E2FSPROGS_LIBUUID + select LIBUUID # FIXME: hal can be configured without policy-kit, but networkmanager depends on it select HAL select HAL__POLKIT diff --git a/rules/nfsutils.in b/rules/nfsutils.in index 09f7c2d..b24c1b3 100644 --- a/rules/nfsutils.in +++ b/rules/nfsutils.in @@ -2,8 +2,7 @@ menuconfig NFSUTILS tristate # we need libblkid - select E2FSPROGS - select E2FSPROGS_LIBBLKID + select LIBBLKID select TCPWRAPPER if NFSUTILS_WITH_TCPWRAPPERS prompt nfsutils help -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Problem compiling splashutils on Debian 4.0
Hi, When trying to build one of our projects on a Debian 4.0 based machine the attached problem occurred. Usually we build on ubuntu 8.10 without problems. I have tried Debian 5.0 also which also builds without a problem. Bypassing the issue is no problem. I'm just curious about why it fails on Debian 4.0? Thanks in advance, Bo --- target: splashutils.prepare --- pkg_deprecated_env=AR=i586-unknown-linux-gnu-ar AS=i586-unknown-linux-gnu-as LD=i586-unknown-linux-gnu-ld NM=i586-unknown-linux-gnu-nm CC=i586-unknown-linux-gnu-gcc CXX=i586-unknown-linux-gnu-g++ CPP=i586-unknown-linux-gnu-cpp RANLIB=i586-unknown-linux-gnu-ranlib READELF=i586-unknown-linux-gnu-readelf OBJCOPY=i586-unknown-linux-gnu-objcopy OBJDUMP=i586-unknown-linux-gnu-objdump STRIP=i586-unknown-linux-gnu-strip DLLTOOL=i586-unknown-linux-gnu-dlltool GNAT=i586-unknown-linux-gnu-gnat GNATBIND=i586-unknown-linux-gnu-gnatbind GNATCHOP=i586-unknown-linux-gnu-gnatchop GNATCLEAN=i586-unknown-linux-gnu-gnatclean GNATFIND=i586-unknown-linux-gnu-gnatfind GNATKR=i586-unknown-linux-gnu-gnatkr GNATLINK=i586-unknown-linux-gnu-gnatlink GNATLS=i586-unknown-linux-gnu-gnatls GNATMAKE=i586-unknown-linux-gnu-gnatmake GNATNAME=i586-unknown-linux-gnu-gnatname GNATPREP=i586-unknown-linux-gnu-gnatprep GNATXREF=i586-unknown-linux-gnu-gnatxref CC_FOR_BUILD=gcc CPP_FOR_BUILD=gcc LINK_FOR_BUILD=gcc CPPFLAGS=-isystem /home/build/ptxia30/platform-atom/sysroot-target/include -isystem /home/build/ptxia30/platform-atom/sysroot-target/usr/include LDFLAGS=-L/home/build/ptxia30/platform-atom/sysroot-target/lib -L/home/build/ptxia30/platform-atom/sysroot-target/usr/lib -Wl,-rpath-link -Wl,/home/build/ptxia30/platform-atom/sysroot-target/lib -Wl,-rpath-link -Wl,/home/build/ptxia30/platform-atom/sysroot-target/usr/lib SYSROOT=/home/build/ptxia30/platform-atom/sysroot-target PKG_CONFIG_PATH='' PKG_CONFIG_LIBDIR='/home/build/ptxia30/platform-atom/sysroot-target/lib/pkgconfig:/home/build/ptxia30/platform-atom/sysroot-target/usr/lib/pkgconfig' PKG_CONFIG=/home/build/ptxia30/platform-atom/sysroot-cross/bin/i586-unknown-linux-gnu-pkg-config ac_cv_func_dcgettext=yes ac_cv_func_getpgrp_void=yes ac_cv_func_getrlimit=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_memcmp_clean=yes ac_cv_func_memcmp_working=yes ac_cv_func_nonposix_getgrgid_r=no ac_cv_func_nonposix_getpwuid_r=no ac_cv_func_posix_getgrgid_r=yes ac_cv_func_posix_getpwnam_r=yes ac_cv_func_posix_getpwuid_r=yes ac_cv_func_printf_unix98=yes ac_cv_func_realloc_0_nonnull=yes ac_cv_func_setgrent_void=yes ac_cv_func_setpgrp_void=yes ac_cv_func_setvbuf_reversed=no ac_cv_func_strstr=yes ac_cv_func_strtod=yes ac_cv_func_strtoul=yes ac_cv_func_vsnprintf_c99=yes ac_cv_have_abstract_sockets=yes ac_cv_lib_c_inet_aton=yes ac_cv_sizeof_long_double=12 ac_cv_sizeof_long_long=8 ac_cv_sysv_ipc=yes ac_cv_type_uintptr_t=yes bash_cv_func_ctype_nonascii=yes bash_cv_func_sigsetjmp=present bash_cv_func_strcoll_broken=no bash_cv_must_reinstall_sighandlers=no glib_cv_long_long_format=ll gt_cv_func_gettext_libintl=yes ac_cv_func_iconv_open=yes pkg_deprecated_autoconf=--prefix=/usr --sysconfdir=/etc --host=i586-unknown-linux-gnu --build=i686-host-linux-gnu --without-gpm --disable-helper --disable-fbcondecor --without-mng --with-png --without-ttf --without-ttf-kernel configure: loading cache /home/build/ptxia30/platform-atom/build-target/splashutils-1.5.4.3/config.cache checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking for i586-unknown-linux-gnu-strip... i586-unknown-linux-gnu-strip checking for i586-unknown-linux-gnu-gcc... i586-unknown-linux-gnu-gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... yes checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether i586-unknown-linux-gnu-gcc accepts -g... yes checking for i586-unknown-linux-gnu-gcc option to accept ISO C89... none needed checking for style of include used by make... GNU checking dependency style of i586-unknown-linux-gnu-gcc... gcc3 checking for a BSD-compatible install... /usr/bin/install -c checking build system type... i686-host-linux-gnu checking host system type... i586-unknown-linux-gnu checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by i586-unknown-linux-gnu-gcc... i586-unknown-linux-gnu-ld checking if the linker (i586-unknown-linux-gnu-ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... i586-unknown-linux-gnu-nm checking the
Re: [ptxdist] [PATCH 04/10] [libuuid] Added virtual package
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Currently E2FSPROGS is selected for those target packages, which need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual package 'libuuid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/libuuid.in | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 rules/libuuid.in diff --git a/rules/libuuid.in b/rules/libuuid.in new file mode 100644 index 000..8134ee6 --- /dev/null +++ b/rules/libuuid.in @@ -0,0 +1,14 @@ +## SECTION=system_libraries + +config LIBUUID + tristate + prompt libuuid + select E2FSPROGS + select E2FSPROGS_LIBUUID + help + Helper to select the target packet containing a recent libuuid.so + library and its header. + + The following packages provide libuuid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [v4] [PULL] Updated libuuid and libblkid
Version 4 of patchstack including review changes and ACK lines. Applies against latest master branch. Can be pulled from git://www.vahanus.net/ptxdist-kp.git on branch 'tmp-virtual-uuid-blkid'. Carsten -- There are newer versions of libuuid and libblkid available in util-linux-ng. It includes also the blkid and uuidgen binaries. As a newer version was a requirement for some other updated tool, I changed the .in files to switch over to these new libs. Ideally there should be stand-alone packages for both libraries, but I couldn't find stand-alone sources yet. To ease later migration I added .in configs for both libs to select the right packages. So packages can select just (HOST_) LIBUUID or LIBBLKID as depends. The old code in e2fsprogs was removed, so mixed installation of libs and binaries from both e2fsprogs and util-linux.ng is avoid. Internal libs are disabled by autoconf for e2fsprogs. Carsten [01/10] [host-libuuid] Added virtual package [02/10] [host-libblkid] Added virtual package [03/10] [host-mtd-utils] Fixup dep to libuuid [04/10] [libuuid] Added virtual package [05/10] [libblkid] Added virtual package [06/10] [host-util-linux-ng] Added host build for newer libuuid and libblkid [07/10] [ptxdist] (1/4) Switch to newer versions of libuuid and libblkid [08/10] [ptxdist] (2/4) Switch to newer versions of libuuid and libblkid [09/10] [ptxdist] (3/4) Switch to newer versions of libuuid and libblkid [10/10] [ptxdist] (4/4) Switch to newer versions of libuuid and libblkid -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 01/10] [host-libuuid] Added virtual package
From: Carsten Schlote c.schl...@konzeptpark.de Currently HOST_E2FSPROGS is selected for those host tools, who need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual host package 'host-libuuid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-libuuid.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 rules/host-libuuid.in diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in new file mode 100644 index 000..53731b0 --- /dev/null +++ b/rules/host-libuuid.in @@ -0,0 +1,12 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBUUID + tristate + select HOST_E2FSPROGS + help + Helper to select the host packet containing a recent libuuid.so + library and its header. + + The following packages provide libuuid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 06/10] [host-util-linux-ng] Added host build for newer libuuid and libblkid
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libuuid and libblkid then the e2fsprogs. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-util-linux-ng.in |7 ++ rules/host-util-linux-ng.make | 42 + 2 files changed, 49 insertions(+), 0 deletions(-) create mode 100644 rules/host-util-linux-ng.in create mode 100644 rules/host-util-linux-ng.make diff --git a/rules/host-util-linux-ng.in b/rules/host-util-linux-ng.in new file mode 100644 index 000..12f2d57 --- /dev/null +++ b/rules/host-util-linux-ng.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_UTIL_LINUX_NG + tristate + select HOST_GETTEXT + help + Useful hosttools and libs for linux ng utils. diff --git a/rules/host-util-linux-ng.make b/rules/host-util-linux-ng.make new file mode 100644 index 000..166683c --- /dev/null +++ b/rules/host-util-linux-ng.make @@ -0,0 +1,42 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_UTIL_LINUX_NG) += host-util-linux-ng + +# +# Paths and names +# +HOST_UTIL_LINUX_NG_DIR = $(HOST_BUILDDIR)/$(UTIL_LINUX_NG) + +# +# Get +# + +$(STATEDIR)/host-util-linux-ng.get: $(STATEDIR)/util-linux-ng.get + @$(call targetinfo) + @$(call touch) + +# +# Prepare +# + +# +# autoconf +# + +HOST_UTIL_LINUX_NG_AUTOCONF := \ + $(HOST_AUTOCONF) \ + --disable-use-tty-group \ + --disable-makeinstall-chown + +# vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 08/10] (2/4) Switch to newer versions of libuuid and libblkid
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch modifies e2fsprogs and util-linux-ng: - Disable compilation of built-in libs in e2fsprogs - Remove selects for e2fsprogs from utils-linux-ng - Moved installtion of libs to ng-utils - Commented out blkid and uuidgen from e2fsprogs to avoid collisions. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@penguttronix.de --- rules/e2fsprogs.in | 18 ++ rules/e2fsprogs.make | 25 +++-- rules/util-linux-ng.in | 33 ++--- rules/util-linux-ng.make | 20 4 files changed, 51 insertions(+), 45 deletions(-) diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in index 825d287..4fc9899 100644 --- a/rules/e2fsprogs.in +++ b/rules/e2fsprogs.in @@ -4,6 +4,8 @@ menuconfig E2FSPROGS tristate prompt e2fsprogs select HOST_GETTEXT + select LIBBLKID if E2FSPROGS_LIBBLKID + select LIBUUID if E2FSPROGS_LIBUUID help The e2fsprogs package provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3 filesystem @@ -105,13 +107,6 @@ config E2FSPROGS_INSTALL_LSATTR help Enable support for lsattr program. -config E2FSPROGS_INSTALL_UUIDGEN - bool - select E2FSPROGS_LIBUUID - prompt uuidgen - help - Enable support for uuidgen program. - # - config E2FSPROGS_INSTALL_BADBLOCKS @@ -122,15 +117,6 @@ config E2FSPROGS_INSTALL_BADBLOCKS help Enable support for badblocks program. -config E2FSPROGS_INSTALL_BLKID - bool - select E2FSPROGS_LIBBLKID - select E2FSPROGS_LIBCOM_ERR - select E2FSPROGS_LIBEXT2FS - select E2FSPROGS_LIBUUID - prompt blkid - help - Enable support for blkid program. config E2FSPROGS_INSTALL_DUMPE2FS bool diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index f8079bd..36fd6c7 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -56,7 +56,9 @@ E2FSPROGS_AUTOCONF := \ --disable-testio-debug \ --disable-tls \ --enable-elf-shlibs \ - --enable-htree + --enable-htree \ + --disable-libblkid \ + --disable-libuuid ifdef PTXCONF_E2FSPROGS_COMPRESSION E2FSPROGS_AUTOCONF += --enable-compression @@ -109,12 +111,6 @@ $(STATEDIR)/e2fsprogs.targetinstall: # # # # libraries # # -ifdef PTXCONF_E2FSPROGS_LIBBLKID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libblkid.so.1.0) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) -endif ifdef PTXCONF_E2FSPROGS_LIBCOM_ERR @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ @@ -144,14 +140,6 @@ ifdef PTXCONF_E2FSPROGS_LIBSS @$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so) endif -ifdef PTXCONF_E2FSPROGS_LIBUUID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libuuid.so.1.2) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so) -endif - - # # # # binaries in /usr/bin # # @@ -161,9 +149,6 @@ endif ifdef PTXCONF_E2FSPROGS_INSTALL_LSATTR @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/lsattr) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) -endif # # @@ -173,10 +158,6 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/badblocks) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/blkid) -endif - ifdef PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/dumpe2fs) endif diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index da3d749..eacd405 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -4,16 +4,19 @@ menuconfig UTIL_LINUX_NG tristate prompt util-linux-ng select HOST_GETTEXT - # select LIBC_UTIL - # we may need libuuid from E2FSPROGS, but we always need blkid - select E2FSPROGS - select E2FSPROGS_LIBBLKID - select E2FSPROGS_LIBUUIDif UTIL_LINUX_NG_MKSWAP_UUID - select NCURSES if UTIL_LINUX_NG_USES_NCURSES - select UTIL_LINUX_NG_USES_NCURSES if UTIL_LINUX_NG_CFDISK || UTIL_LINUX_NG_SETTERM + select UTIL_LINUX_NG_LIBBLKID + select UTIL_LINUX_NG_LIBUUIDif UTIL_LINUX_NG_MKSWAP_UUID + select NCURSES
Re: [ptxdist] [v4] Review changes for host-util-linux-ng
Carsten Schlote wrote: Marc Kleine-Budde wrote: Carsten Schlote wrote: That's the last missing ACK... so just this patch is posted. can you fix the remaining prompt issue for the host package and give me a git repo to pull from? See last patch post on list for the git-feed. The prompt issue is already included in this patch. Simply removed, so that the package will auto-deselect if no longer needed by some dependancy. Thanks for the review :-) it doesn't work, though :( It's a problem of the dependency generator. It stops looking for dependencies if a dependency itself is not a real package. A real package is defined by the PACKAGES-$(PTXCONF_PKG) += pkg line. mtd-utils selects libuuid which selects util-linux-ng but the dependency generator stops at libuuid, because it's not a real pacakge. But I think this issue can be solved. Another think that shows up is: rules/host-mtd-utils.in:7:warning: 'select' used by config symbol 'HOST_MTD_UTILS' refers to undefined symbol 'HOST_LIBUUID' I have a fix for this in my public ptxdist repo. http://git.pengutronix.de/?p=mkl/ptxdist.git;a=shortlog;h=refs/heads/dev/libuuid I'll talk to you when I've fixed dependency generator problem. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [v4] Review changes for host-util-linux-ng
Hi Marc, it doesn't work, though :( Not as expected :-) Anyway it think it's a good idea to support such stuff. Selecting HOST_LIBFOO is much more self-describing then selecting some package just to get the contained libraries installed. I have a fix for this in my public ptxdist repo. http://git.pengutronix.de/?p=mkl/ptxdist.git;a=shortlog;h=refs/heads/de v/libuuid I fixed that problem later the same way in my patch-stack and forgot it for the patch subset. I'll talk to you when I've fixed dependency generator problem. I hope you can fix that soon. Originally I directly selected the target package. But for the reason given above, I tried this 'virtual' package approach. There are several other libraries in my stack, which could use this feature as well. When you find some time, you might want to check my patchlist at http://www.vahanus.net/cgi-bin/gitweb.cgi?p=ptxdist-kp.git;a=shortlog;h= refs/heads/for-upstream-next and point out, what patches you would like to see next. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Author: Carsten Schlote c.schl...@konzeptpark.de
[virtual-packages] Fix for missing dependancy handling Currently indirect kconfig depends can't be handled without a .make fragment. Added noop fake targets until dgen is fixed. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de diff --git a/rules/host-libblkid.make b/rules/host-libblkid.make new file mode 100644 index 000..a1b58b5 --- /dev/null +++ b/rules/host-libblkid.make @@ -0,0 +1,37 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_LIBBLKID) += host-libblkid + +# +# Virtual fake package +# + +$(STATEDIR)/host-libblkid.get: + @$(call touch) + +$(STATEDIR)/host-libblkid.extract: + @$(call touch) + +$(STATEDIR)/host-libblkid.prepare: + @$(call touch) + +$(STATEDIR)/host-libblkid.compile: + @$(call touch) + +$(STATEDIR)/host-libblkid.install: + @$(call targetinfo) + @$(call touch) + + +# vim: syntax=make diff --git a/rules/host-libuuid.make b/rules/host-libuuid.make new file mode 100644 index 000..8c836cf --- /dev/null +++ b/rules/host-libuuid.make @@ -0,0 +1,37 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_LIBUUID) += host-libuuid + +# +# Virtual fake package +# + +$(STATEDIR)/host-libuuid.get: + @$(call touch) + +$(STATEDIR)/host-libuuid.extract: + @$(call touch) + +$(STATEDIR)/host-libuuid.prepare: + @$(call touch) + +$(STATEDIR)/host-libuuid.compile: + @$(call touch) + +$(STATEDIR)/host-libuuid.install: + @$(call targetinfo) + @$(call touch) + + +# vim: syntax=make diff --git a/rules/libblkid.make b/rules/libblkid.make new file mode 100644 index 000..aafc8a5 --- /dev/null +++ b/rules/libblkid.make @@ -0,0 +1,37 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_LIBBLKID) += libblkid + +# +# Virtual fake package +# + +$(STATEDIR)/libblkid.get: + @$(call touch) + +$(STATEDIR)/libblkid.extract: + @$(call touch) + +$(STATEDIR)/libblkid.prepare: + @$(call touch) + +$(STATEDIR)/libblkid.compile: + @$(call touch) + +$(STATEDIR)/libblkid.install: + @$(call targetinfo) + @$(call touch) + + +# vim: syntax=make diff --git a/rules/libuuid.make b/rules/libuuid.make new file mode 100644 index 000..44a6dfb --- /dev/null +++ b/rules/libuuid.make @@ -0,0 +1,37 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_LIBUUID) += libuuid + +# +# Virtual fake package +# + +$(STATEDIR)/libuuid.get: + @$(call touch) + +$(STATEDIR)/libuuid.extract: + @$(call touch) + +$(STATEDIR)/libuuid.prepare: + @$(call touch) + +$(STATEDIR)/libuuid.compile: + @$(call touch) + +$(STATEDIR)/libuuid.install: + @$(call targetinfo) + @$(call touch) + + +# vim: syntax=make -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [virtual-packages] Fix for missing dependancy handling
Hi Marc, I added the following stub .make files. It's a workaround for problem with the unhandled dependancies. Build is now working again. Carsten -- commit 446422734d0b84191bfcde272765123b635a02a3 Author: Carsten Schlote c.schl...@konzeptpark.de Date: Wed Jan 20 19:10:44 2010 +0100 [virtual-packages] Fix for missing dependancy handling Currently indirect kconfig depends can't be handled without a .make fragment. Added noop fake targets until dgen is fixed. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de diff --git a/rules/host-libblkid.make b/rules/host-libblkid.make new file mode 100644 index 000..a1b58b5 --- /dev/null +++ b/rules/host-libblkid.make @@ -0,0 +1,37 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_LIBBLKID) += host-libblkid + +# +# Virtual fake package +# + +$(STATEDIR)/host-libblkid.get: + @$(call touch) + +$(STATEDIR)/host-libblkid.extract: + @$(call touch) + +$(STATEDIR)/host-libblkid.prepare: + @$(call touch) + +$(STATEDIR)/host-libblkid.compile: + @$(call touch) + +$(STATEDIR)/host-libblkid.install: + @$(call targetinfo) + @$(call touch) + + +# vim: syntax=make diff --git a/rules/host-libuuid.make b/rules/host-libuuid.make new file mode 100644 index 000..8c836cf --- /dev/null +++ b/rules/host-libuuid.make @@ -0,0 +1,37 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_LIBUUID) += host-libuuid + +# +# Virtual fake package +# + +$(STATEDIR)/host-libuuid.get: + @$(call touch) + +$(STATEDIR)/host-libuuid.extract: + @$(call touch) + +$(STATEDIR)/host-libuuid.prepare: + @$(call touch) + +$(STATEDIR)/host-libuuid.compile: + @$(call touch) + +$(STATEDIR)/host-libuuid.install: + @$(call targetinfo) + @$(call touch) + + +# vim: syntax=make diff --git a/rules/libblkid.make b/rules/libblkid.make new file mode 100644 index 000..aafc8a5 --- /dev/null +++ b/rules/libblkid.make @@ -0,0 +1,37 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_LIBBLKID) += libblkid + +# +# Virtual fake package +# + +$(STATEDIR)/libblkid.get: + @$(call touch) + +$(STATEDIR)/libblkid.extract: + @$(call touch) + +$(STATEDIR)/libblkid.prepare: + @$(call touch) + +$(STATEDIR)/libblkid.compile: + @$(call touch) + +$(STATEDIR)/libblkid.install: + @$(call targetinfo) + @$(call touch) + + +# vim: syntax=make diff --git a/rules/libuuid.make b/rules/libuuid.make new file mode 100644 index 000..44a6dfb --- /dev/null +++ b/rules/libuuid.make @@ -0,0 +1,37 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_LIBUUID) += libuuid + +# +# Virtual fake package +# + +$(STATEDIR)/libuuid.get: + @$(call touch) + +$(STATEDIR)/libuuid.extract: + @$(call touch) + +$(STATEDIR)/libuuid.prepare: + @$(call touch) + +$(STATEDIR)/libuuid.compile: + @$(call touch) + +$(STATEDIR)/libuuid.install: + @$(call targetinfo) + @$(call touch) + + +# vim: syntax=make -- ptxdist mailing list ptxdist@pengutronix.de
