From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 03/11] util-linux-ng: clean up package
Date: Sun, 30 Oct 2011 22:56:13 +0100 [thread overview]
Message-ID: <1320011781-24886-3-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320011781-24886-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
rules/util-linux-ng.make | 65 +++++----------------------------------------
1 files changed, 8 insertions(+), 57 deletions(-)
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 519a885..f8fc568 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -27,14 +27,6 @@ UTIL_LINUX_NG_DIR := $(BUILDDIR)/$(UTIL_LINUX_NG)
UTIL_LINUX_NG_LICENSE := GPLv2+
# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(UTIL_LINUX_NG_SOURCE):
- @$(call targetinfo)
- @$(call get, UTIL_LINUX_NG)
-
-# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
@@ -83,49 +75,14 @@ UTIL_LINUX_NG_AUTOCONF := \
--without-slang \
--without-selinux \
--without-audit \
- --without-utempter
-
-ifdef PTXCONF_UTIL_LINUX_NG_LINE
-UTIL_LINUX_NG_AUTOCONF += --enable-line
-else
-UTIL_LINUX_NG_AUTOCONF += --disable-line
-endif
-
-ifdef PTXCONF_UTIL_LINUX_NG_DDATE
-UTIL_LINUX_NG_AUTOCONF += --enable-ddate
-else
-UTIL_LINUX_NG_AUTOCONF += --disable-ddate
-endif
-
-ifdef PTXCONF_UTIL_LINUX_NG_MOUNTPOINT
-UTIL_LINUX_NG_AUTOCONF += --enable-mountpoint
-else
-UTIL_LINUX_NG_AUTOCONF += --disable-mountpoint
-endif
-
-ifdef PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS
-UTIL_LINUX_NG_AUTOCONF += --enable-partx
-else
-UTIL_LINUX_NG_AUTOCONF += --disable-partx
-endif
-
-ifdef PTXCONF_UTIL_LINUX_NG_FSCK
-UTIL_LINUX_NG_AUTOCONF += --enable-fsck
-else
-UTIL_LINUX_NG_AUTOCONF += --disable-fsck
-endif
-
-ifdef PTXCONF_UTIL_LINUX_NG_AGETTY
-UTIL_LINUX_NG_AUTOCONF += --enable-agetty
-else
-UTIL_LINUX_NG_AUTOCONF += --disable-agetty
-endif
-
-ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID
-UTIL_LINUX_NG_AUTOCONF += --enable-libuuid
-else
-UTIL_LINUX_NG_AUTOCONF += --disable-libuuid
-endif
+ --without-utempter \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LINE)-line \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_DDATE)-ddate \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNTPOINT)-mountpoint \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS)-partx \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_FSCK)-fsck \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid
# ----------------------------------------------------------------------------
# Target-Install
@@ -210,27 +167,21 @@ endif
ifdef PTXCONF_UTIL_LINUX_NG_MCOOKIE
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mcookie)
endif
-
ifdef PTXCONF_UTIL_LINUX_NG_LIBBLKID
@$(call install_lib, util-linux-ng, 0, 0, 0644, libblkid)
endif
-
ifdef PTXCONF_UTIL_LINUX_NG_BLKID
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/blkid)
endif
-
ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID
@$(call install_lib, util-linux-ng, 0, 0, 0644, libuuid)
endif
-
ifdef PTXCONF_UTIL_LINUX_NG_LIBMOUNT
# FIXME - no user yet
endif
-
ifdef PTXCONF_UTIL_LINUX_NG_UUIDGEN
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/uuidgen)
endif
-
ifdef PTXCONF_UTIL_LINUX_NG_FINDFS
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/findfs)
endif
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
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 ` [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20 Robert Schwebel
2011-11-03 14:21 ` Michael Olbrich
2011-10-30 21:56 ` Robert Schwebel [this message]
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-3-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