aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils
diff options
context:
space:
mode:
authorPaul Wassi <p.wassi@gmx.at>2018-03-24 14:10:03 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-03-31 16:30:17 +0200
commit960b90f4356097c8cbb4584959f03260b93fe121 (patch)
treef10517fbdad34f8b062616b4fd7f491daead1f71 /package/utils
parentaf35ce1065ac75973ac9e51940c800361371d6fb (diff)
downloadupstream-960b90f4356097c8cbb4584959f03260b93fe121.tar.gz
upstream-960b90f4356097c8cbb4584959f03260b93fe121.tar.bz2
upstream-960b90f4356097c8cbb4584959f03260b93fe121.zip
packages/util/util-linux: Update to 2.32
- Update to upstream 2.32 - License file 'getopt/COPYING' not present (any more) - Disable 'chown root:root'-commands during 'make install' - Add new dependency to wipefs - Refresh patch 003 Signed-off-by: Paul Wassi <p.wassi@gmx.at>
Diffstat (limited to 'package/utils')
-rw-r--r--package/utils/util-linux/Makefile28
-rw-r--r--package/utils/util-linux/patches/003-fix_pkgconfig_files.patch4
2 files changed, 16 insertions, 16 deletions
diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index ed974ce834..8986593064 100644
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -8,17 +8,16 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux
-PKG_VERSION:=2.30.2
-PKG_RELEASE:=2
+PKG_VERSION:=2.32
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.30
-PKG_HASH:=7b5be5489e9b5b7177832836467aba1c87bf0e9bcbcb5a6f35d76cd4782589dc
+PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.32
+PKG_HASH:=6c7397abc764e32e8159c2e96042874a190303e77adceb4ac5bd502a272a4734
PKG_CPE_ID:=cpe:/a:kernel:util-linux
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:= COPYING \
- getopt/COPYING \
libblkid/COPYING \
libmount/COPYING \
Documentation/licenses/COPYING.GPLv2 \
@@ -462,7 +461,7 @@ endef
define Package/wipefs
$(call Package/util-linux/Default)
TITLE:=wipe a signature from a device
- DEPENDS:= +libblkid
+ DEPENDS:= +libblkid +libsmartcols
SUBMENU:=Disc
endef
@@ -473,14 +472,15 @@ define Package/wipefs/description
endef
CONFIGURE_ARGS += \
- --disable-use-tty-group \
- --disable-rpath \
- --disable-tls \
- --disable-sulogin \
- --without-python \
- --without-udev \
- --without-readline \
- --disable-more \
+ --disable-use-tty-group \
+ --disable-rpath \
+ --disable-tls \
+ --disable-sulogin \
+ --disable-makeinstall-chown \
+ --without-python \
+ --without-udev \
+ --without-readline \
+ --disable-more \
--with-ncursesw
TARGET_CFLAGS += $(FPIC) -std=gnu99
diff --git a/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch b/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch
index c79813b1bd..0cf1546954 100644
--- a/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch
+++ b/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch
@@ -10,7 +10,7 @@
endif # BUILD_LIBUUID
--- a/configure.ac
+++ b/configure.ac
-@@ -2255,18 +2255,23 @@ AC_CONFIG_HEADERS([config.h])
+@@ -2351,18 +2351,23 @@ AC_CONFIG_HEADERS([config.h])
#
AC_CONFIG_FILES([
Makefile
@@ -42,7 +42,7 @@
pkgconfig_DATA += libblkid/blkid.pc
-PATHFILES += libblkid/blkid.pc
dist_man_MANS += libblkid/libblkid.3
- EXTRA_DIST += libblkid/libblkid.3 libblkid/COPYING
+ EXTRA_DIST += libblkid/COPYING
--- a/libmount/Makemodule.am
+++ b/libmount/Makemodule.am