From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH] util-linux: version bump 2.25.2 -> 2.26.1
Date: Sun, 15 Mar 2015 20:53:25 +0100 [thread overview]
Message-ID: <1426449205-6284-1-git-send-email-r.schwebel@pengutronix.de> (raw)
This version has three new configure options; the most important change
is that all fdisk variants use libfdisk now.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-__progname-redefinition-fix.patch | 0
patches/{util-linux-2.25.2 => util-linux-2.26.1}/series | 0
rules/util-linux-ng.in | 6 ++++++
rules/util-linux-ng.make | 10 ++++++++--
4 files changed, 14 insertions(+), 2 deletions(-)
rename patches/{util-linux-2.25.2 => util-linux-2.26.1}/0001-__progname-redefinition-fix.patch (100%)
rename patches/{util-linux-2.25.2 => util-linux-2.26.1}/series (100%)
diff --git a/patches/util-linux-2.25.2/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.26.1/0001-__progname-redefinition-fix.patch
similarity index 100%
rename from patches/util-linux-2.25.2/0001-__progname-redefinition-fix.patch
rename to patches/util-linux-2.26.1/0001-__progname-redefinition-fix.patch
diff --git a/patches/util-linux-2.25.2/series b/patches/util-linux-2.26.1/series
similarity index 100%
rename from patches/util-linux-2.25.2/series
rename to patches/util-linux-2.26.1/series
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index af48fcf..4eb7eca 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -14,6 +14,9 @@ if UTIL_LINUX_NG
config UTIL_LINUX_NG_LIBBLKID
bool
+config UTIL_LINUX_NG_LIBFDISK
+ bool
+
config UTIL_LINUX_NG_LIBUUID
bool
@@ -87,6 +90,7 @@ comment "BusyBox' mountpoint is selected!"
config UTIL_LINUX_NG_FDISK
bool
prompt "fdisk"
+ select UTIL_LINUX_NG_LIBFDISK
select UTIL_LINUX_NG_LIBUUID
select UTIL_LINUX_NG_LIBSMARTCOLS
depends on !BUSYBOX_FDISK || ALLYES
@@ -98,6 +102,7 @@ comment "BusyBox' fdisk is selected!"
config UTIL_LINUX_NG_SFDISK
bool
+ select UTIL_LINUX_NG_LIBFDISK
prompt "sfdisk"
help
sfdisk - Partition table manipulator for Linux,
@@ -105,6 +110,7 @@ config UTIL_LINUX_NG_SFDISK
config UTIL_LINUX_NG_CFDISK
bool
+ select UTIL_LINUX_NG_LIBFDISK
select UTIL_LINUX_NG_LIBUUID
select UTIL_LINUX_NG_LIBSMARTCOLS
select UTIL_LINUX_NG_USES_NCURSES
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 0094595..2674a8a 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
#
# Paths and names
#
-UTIL_LINUX_NG_VERSION := 2.25.2
-UTIL_LINUX_NG_MD5 := cab3d7be354000f629bc601238b629b3
+UTIL_LINUX_NG_VERSION := 2.26.1
+UTIL_LINUX_NG_MD5 := 2308850946766677f3fabe0685e85de8
UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION)
UTIL_LINUX_NG_SUFFIX := tar.xz
UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL, utils/util-linux/v$(basename $(UTIL_LINUX_NG_VERSION))/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
@@ -60,8 +60,10 @@ UTIL_LINUX_NG_CONF_OPT := \
--enable-all-programs=undefined \
--enable-tls \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBUUID)-libuuid \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBFDISK)-libfdisk \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBBLKID)-libblkid \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount-force-mountinfo \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS)-libsmartcols \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNT)-mount \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LOSETUP)-losetup \
@@ -119,6 +121,7 @@ UTIL_LINUX_NG_CONF_OPT := \
--disable-sulogin-emergency-mount \
--disable-makeinstall-chown \
--disable-makeinstall-setuid \
+ --disable-colors-default \
--without-libiconv-prefix \
--without-libintl-prefix \
--without-selinux \
@@ -146,6 +149,9 @@ $(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_LIBFDISK
+ @$(call install_lib, util-linux-ng, 0, 0, 0644, libfdisk)
+endif
ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID
@$(call install_lib, util-linux-ng, 0, 0, 0644, libuuid)
endif
--
2.1.4
--
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2015-03-15 19:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1426449205-6284-1-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