From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20
Date: Sun, 30 Oct 2011 22:56:12 +0100 [thread overview]
Message-ID: <1320011781-24886-2-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320011781-24886-1-git-send-email-r.schwebel@pengutronix.de>
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
next prev parent reply other threads:[~2011-10-30 21:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Robert Schwebel [this message]
2011-11-03 14:21 ` [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320011781-24886-2-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox