summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-12-30 15:39:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:50 +0000
commit0f8c09193ecb183715e99782da2f093ea62a9864 (patch)
treeb3fce47b7b0cb8aa41c1b9ebcda099612d9238ba /meta
parent09aa2b1ed85408939a8bae433c032ea5da7cc7a5 (diff)
downloadpoky-0f8c09193ecb183715e99782da2f093ea62a9864.tar.gz
util-linux: upgrade to 2.25.2
fix-configure.patch is removed as it's not appropriate, and the new version of util-linux has solved the problem this patch is trying to solve. util-linux-ensure-the-existence-of-directory-for-PAT.patch is removed as the new version of util-linux has solved the problem this patch is trying to solve. util-linux-native.patch is rebased. util-linux-ng-replace-siginterrupt.patch is rebased. Add PACKAGECONFIG for 'pylibmount' to build out python bindings for libmount optionally. util-linux-pylibmount is added to PACKAGES if PACKAGECONFIG has 'pylibmount' in it. Fix PACAGECONFIG for 'systemd' as the new version has changed things related to systemd. Now util-linux would have a dependency on systemd if 'systemd' is in PACKAGECONFIG. Fix SYSTEMD_PACKAGES, SYSTEMD_SERVICE and SYSTEMD_AUTO_ENABLE variable to match the new version. Four lines in do_compile task are deleted because they caused do_compile failure and nowhere in util-linux are they used. Corresponding files are also removed. (From OE-Core rev: 264e2fde3a8624c87d2451d2752c9f3ed8911672) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc31
-rw-r--r--meta/recipes-core/util-linux/util-linux/MCONFIG223
-rw-r--r--meta/recipes-core/util-linux/util-linux/defines.h10
-rw-r--r--meta/recipes-core/util-linux/util-linux/fix-configure.patch20
-rw-r--r--meta/recipes-core/util-linux/util-linux/make_include17
-rw-r--r--meta/recipes-core/util-linux/util-linux/swapargs.h3
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch34
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-native.patch54
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch24
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.25.2.bb (renamed from meta/recipes-core/util-linux/util-linux_2.24.2.bb)8
10 files changed, 53 insertions, 371 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index e6c00e437e..af30887d80 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -17,16 +17,12 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c
17 file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ 17 file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \
18 file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" 18 file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16"
19 19
20inherit autotools gettext pkgconfig systemd 20inherit autotools gettext pkgconfig systemd update-alternatives python-dir
21DEPENDS = "zlib ncurses" 21DEPENDS = "zlib ncurses"
22DEPENDS_append_class-native = " lzo-native" 22DEPENDS_append_class-native = " lzo-native"
23DEPENDS_append_class-nativesdk = " lzo-native" 23DEPENDS_append_class-nativesdk = " lzo-native"
24 24
25SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ 25SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \
26 file://MCONFIG \
27 file://defines.h \
28 file://make_include \
29 file://swapargs.h \
30 " 26 "
31 27
32PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ 28PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
@@ -38,6 +34,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
38 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ 34 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
39 util-linux-partx ${PN}-bash-completion util-linux-hwclock \ 35 util-linux-partx ${PN}-bash-completion util-linux-hwclock \
40 util-linux-findfs util-linux-getopt" 36 util-linux-findfs util-linux-getopt"
37PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"
41 38
42SHARED_EXTRA_OECONF = "--disable-use-tty-group \ 39SHARED_EXTRA_OECONF = "--disable-use-tty-group \
43 --disable-makeinstall-chown \ 40 --disable-makeinstall-chown \
@@ -56,14 +53,20 @@ PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'p
56PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," 53PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam,"
57 54
58# Respect the systemd feature for uuidd 55# Respect the systemd feature for uuidd
59PACKAGECONFIG[systemd] = "--enable-socket-activation --with-systemdsystemunitdir=${systemd_unitdir}/system/, --disable-socket-activation --without-systemdsystemunitdir" 56PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemd --without-systemdsystemunitdir,systemd"
60 57
61# Build setpriv requires libcap-ng 58# Build setpriv requires libcap-ng
62PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," 59PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng,"
63 60
61# Build python bindings for libmount
62PACKAGECONFIG[pylibmount] = "--with-python --enable-pylibmount,--without-python --disable-pylibmount,python"
63
64FILES_${PN}-bash-completion += "${datadir}/bash-completion" 64FILES_${PN}-bash-completion += "${datadir}/bash-completion"
65FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" 65FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
66 66
67FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.la"
68FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/.debug/"
69
67FILES_util-linux-agetty = "${base_sbindir}/agetty" 70FILES_util-linux-agetty = "${base_sbindir}/agetty"
68FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" 71FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}"
69FILES_util-linux-fstrim = "${base_sbindir}/fstrim" 72FILES_util-linux-fstrim = "${base_sbindir}/fstrim"
@@ -85,6 +88,8 @@ FILES_util-linux-getopt = "${bindir}/getopt.${BPN}"
85 88
86FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" 89FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
87FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" 90FILES_util-linux-libmount = "${base_libdir}/libmount.so.*"
91FILES_util-linux-pylibmount = "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \
92 ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.*"
88FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" 93FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*"
89FILES_util-linux-lscpu = "${bindir}/lscpu" 94FILES_util-linux-lscpu = "${bindir}/lscpu"
90 95
@@ -94,7 +99,6 @@ FILES_util-linux-mkfs = "${sbindir}/mkfs"
94FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" 99FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs"
95FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" 100FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs"
96 101
97
98# Util-linux' blkid replaces the e2fsprogs one 102# Util-linux' blkid replaces the e2fsprogs one
99FILES_util-linux-blkid = "${base_sbindir}/blkid*" 103FILES_util-linux-blkid = "${base_sbindir}/blkid*"
100RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" 104RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
@@ -113,15 +117,14 @@ RDEPENDS_${PN}_class-nativesdk = ""
113 117
114RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" 118RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev"
115 119
116SYSTEMD_PACKAGES = "${PN}-uuidd" 120SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim"
117SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.service" 121SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service"
122SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable"
123SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service"
124SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable"
118 125
119do_compile () { 126do_compile () {
120 set -e 127 set -e
121 install ${WORKDIR}/MCONFIG ${S}/MCONFIG
122 install ${WORKDIR}/make_include ${S}/make_include
123 install ${WORKDIR}/swapargs.h ${S}/mount-deprecated/swapargs.h
124 install ${WORKDIR}/defines.h ${S}/defines.h
125 oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' 128 oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'
126} 129}
127 130
@@ -164,8 +167,6 @@ do_install () {
164 rm -f ${D}${bindir}/chkdupexe 167 rm -f ${D}${bindir}/chkdupexe
165} 168}
166 169
167inherit update-alternatives
168
169ALTERNATIVE_PRIORITY = "100" 170ALTERNATIVE_PRIORITY = "100"
170 171
171ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" 172ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"
diff --git a/meta/recipes-core/util-linux/util-linux/MCONFIG b/meta/recipes-core/util-linux/util-linux/MCONFIG
deleted file mode 100644
index 3fea2c02d7..0000000000
--- a/meta/recipes-core/util-linux/util-linux/MCONFIG
+++ /dev/null
@@ -1,223 +0,0 @@
1# MCONFIG -- Configuration stuff for util-linux
2# Created: Sat Feb 4 15:50:30 1995
3# Copyright 1995 Rickard E. Faith (faith@cs.unc.edu)
4
5# For a user-mode install, make (at least) three changes:
6# - remove the `-o root' part in INSTALLSUID
7# - set USE_TTY_GROUP=no
8# - define DESTDIR
9
10# Select for ARCH one of intel, alpha, sparc, arm, m68k, mips
11# Select for CPU i386 if the binaries must be able to run on an intel 386
12# (by default i486 code is generated, see below)
13CPU=$(shell uname -m)
14ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/')
15
16# If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
17# will use PAM for authentication. Additionally, passwd will not be
18# installed as it is not PAM aware.
19HAVE_PAM=no
20
21# If HAVE_SHADOW is set to "yes", then login, chfn, chsh, newgrp, passwd,
22# and vipw will not be built or installed from the login-utils
23# subdirectory.
24HAVE_SHADOW=yes
25
26# If HAVE_PASSWD is set to "yes", then passwd will not be built or
27# installed from the login-utils subdirectory (but login, chfn, chsh,
28# newgrp, and vipw *will* be installed).
29HAVE_PASSWD=no
30
31# If you use chfn and chsh from this package, REQUIRE_PASSWORD will require
32# non-root users to enter the account password before updating /etc/passwd.
33REQUIRE_PASSWORD=yes
34#REQUIRE_PASSWORD=no
35
36# If you use chsh from this package, ONLY_LISTED_SHELLS will require that
37# the selected shell be listed in /etc/shells -- otherwise only a warning is
38# printed. This prevents someone from setting their shell to /bin/false.
39ONLY_LISTED_SHELLS=yes
40#ONLY_LISTED_SHELLS=no
41
42
43# If HAVE_SYSVINIT is set to "yes", then simpleinit and shutdown will not
44# be built or installed from the login-utils subdirectory. (The shutdown
45# and halt that come with the SysVinit package should be used with the init
46# found in that package.)
47HAVE_SYSVINIT=no
48
49# If HAVE_SYSVINIT_UTILS is set to "yes", then last, mesg, and wall will
50# not be built or installed from the login-utils subdirectory. (The
51# shutdown and init from the SysVinit package do not depend on the last,
52# mesg, and wall from that package.)
53HAVE_SYSVINIT_UTILS=no
54
55# If HAVE_WRITE is set to "yes", then write will not be built or
56# installed from the misc-utils subdirectory.
57# (There is a network aware write in netwrite from NetKit 0.16 or later.)
58HAVE_WRITE=no
59
60# If HAVE_GETTY is set to "yes", then agetty will not be built or
61# installed from the login-utils subdirectory. Note that agetty can
62# co-exist with other gettys, so this option should never be used.
63HAVE_GETTY=no
64
65# If USE_TTY_GROUP is set to "yes", then wall and write will be installed
66# setgid to the "tty" group, and mesg will only set the group write bit.
67# Note that this is only useful if login/xterm/etc. change the group of the
68# user's tty to "tty" [The login in util-linux does this correctly, and
69# xterm will do it correctly if X is compiled with USE_TTY_GROUP set
70# properly.]
71USE_TTY_GROUP=no
72
73# If HAVE_KILL is set to "yes", then kill will not be built or
74# installed from the misc-utils subdirectory.
75# (There is also a kill in the procps package.)
76HAVE_KILL=no
77
78# If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN
79# to the current user, allowing her to make a screendump and do other
80# nifty things on the console, but also allowing him to keep an open
81# file descriptor after logging out to trick the next user.
82ALLOW_VCS_USE=yes
83
84# If HAVE_RESET is set to "yes", then reset won't be installed. The version
85# of reset that comes with the ncurses package is less aggressive.
86HAVE_RESET=yes
87
88# If HAVE_SLN is set to "yes", then sln won't be installed
89# (but the man page sln.8 will be installed anyway).
90# sln also comes with libc and glibc.
91HAVE_SLN=no
92
93# If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
94HAVE_FDUTILS=no
95
96# If SILENT_PG is set to "yes", then pg will not ring the bell
97# when an invalid key is pressed
98SILENT_PG=no
99
100# If configure decides that Native Language Support (NLS) is available,
101# it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set
102# DISABLE_NLS to "yes".
103DISABLE_NLS=no
104
105# Different optimizations for different cpus.
106# gcc 3.0 likes options -mcpu=i486 instead of -m486
107ifeq "$(ARCH)" "intel"
108 ifeq "$(HAVE_OLD_GCC)" "yes"
109 CPUHEAD=-m
110 else
111 CPUHEAD=-mcpu=i
112 endif
113 ifeq "$(CPU)" "i386"
114 CPUTAIL=386
115 else
116 CPUTAIL=486
117 endif
118 CPUOPT= $(CPUHEAD)$(CPUTAIL)
119 OPT= -pipe -O2 $(CPUOPT) -fomit-frame-pointer
120else
121 ifeq "$(ARCH)" "arm"
122 OPT= -pipe -O2 -fsigned-char -fomit-frame-pointer
123 else
124 OPT= -O2 -fomit-frame-pointer
125 endif
126endif
127
128WARNFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes
129
130LIB=../lib
131
132ERR_O=$(LIB)/err.o
133
134# Set HAVE_SLANG to yes if you have slang (and prefer to use that for cfdisk)
135# (If neither HAVE_NCURSES nor HAVE_SLANG is defined, cfdisk is not made.)
136# HAVE_SLANG=yes
137# There is a subdirectory /usr/include/slang containing slcurses.h
138# SLANGFLAGS=-I/usr/include/slang
139# No such subdirectory - slcurses.h lives in /usr/include
140# (no extra definition required).
141LIBSLANG=-lslang
142
143#
144# Paths used for compilation (not all are actually used, see CFLAGS below)
145#
146DEV_DIR= /dev
147ETC_DIR= /etc
148SBIN_DIR= /sbin
149USRSBIN_DIR= /usr/sbin
150USRLIB_DIR= /usr/lib
151USRBIN_DIR= /usr/bin
152USRGAMES_DIR= /usr/games
153USRSHAREMISC_DIR=/usr/share/misc
154LOCALE_DIR= /usr/share/locale
155BIN_DIR= /bin
156VAR_PATH= /var
157LOG_DIR= /var/log
158MAN_DIR= /usr/share/man
159INFO_DIR= /usr/share/info
160
161#
162# Paths used for install
163#
164DEVDIR= $(DESTDIR)$(DEV_DIR)
165ETCDIR= $(DESTDIR)$(ETC_DIR)
166SBINDIR= $(DESTDIR)$(SBIN_DIR)
167USRSBINDIR= $(DESTDIR)$(USRSBIN_DIR)
168USRLIBDIR= $(DESTDIR)$(USRLIB_DIR)
169USRBINDIR= $(DESTDIR)$(USRBIN_DIR)
170USRGAMESDIR= $(DESTDIR)$(USRGAMES_DIR)
171USRSHAREMISCDIR=$(DESTDIR)$(USRSHAREMISC_DIR)
172LOCALEDIR= $(DESTDIR)$(LOCALE_DIR)
173BINDIR= $(DESTDIR)$(BIN_DIR)
174VARPATH= $(DESTDIR)$(VAR_PATH)
175LOGDIR= $(DESTDIR)$(LOG_DIR)
176MANDIR= $(DESTDIR)$(MAN_DIR)
177MAN1DIR= $(MANDIR)/man1
178MAN3DIR= $(MANDIR)/man3
179MAN5DIR= $(MANDIR)/man5
180MAN6DIR= $(MANDIR)/man6
181MAN8DIR= $(MANDIR)/man8
182INFODIR= $(DESTDIR)$(INFO_DIR)
183
184# Directory for shutdown, halt, reboot, etc.
185SHUTDOWNDIR= $(SBINDIR)
186
187# Modes
188DIRMODE= 755
189BINMODE= 755
190MANMODE= 644
191DATMODE= 644
192INFOMODE= 644
193SUIDMODE= 4755
194
195CHMOD= chmod
196INSTALL= install
197INSTALLDIR= $(INSTALL) -d -m $(DIRMODE)
198INSTALLBIN= $(INSTALL) -m $(BINMODE)
199INSTALLMAN= $(INSTALL) -m $(MANMODE)
200INSTALLDAT= $(INSTALL) -m $(DATMODE)
201INSTALLSUID= $(INSTALL) -m $(SUIDMODE)
202
203ifeq "$(DISABLE_NLS)" "yes"
204NLSFLAGS = -DDISABLE_NLS
205endif
206
207CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \
208 $(CURSESFLAGS) $(SLANGFLAGS) $(NLSFLAGS) \
209 -D_FILE_OFFSET_BITS=64 \
210 -DSBINDIR=\"$(SBIN_DIR)\" \
211 -DUSRSBINDIR=\"$(USRSBIN_DIR)\" \
212 -DLOGDIR=\"$(LOG_DIR)\" \
213 -DVARPATH=\"$(VAR_PATH)\" \
214 -DLOCALEDIR=\"$(LOCALE_DIR)\" \
215 $(CFLAGS)
216
217
218%.o: %.c
219 $(CC) -c $(CFLAGS) $< -o $@
220
221%: %.cc
222 $(CXX) $(CFLAGS) $< -o $@
223
diff --git a/meta/recipes-core/util-linux/util-linux/defines.h b/meta/recipes-core/util-linux/util-linux/defines.h
deleted file mode 100644
index 6ce6b86df5..0000000000
--- a/meta/recipes-core/util-linux/util-linux/defines.h
+++ /dev/null
@@ -1,10 +0,0 @@
1#define UTIL_LINUX_VERSION "2.12"
2#define util_linux_version "util-linux-2.12"
3
4#define HAVE_blkpg_h
5#define HAVE_kd_h
6#define HAVE_locale_h
7#define HAVE_langinfo_h
8#define HAVE_sys_user_h
9#define HAVE_asm_types_h
10//#define NEED_tqueue_h
diff --git a/meta/recipes-core/util-linux/util-linux/fix-configure.patch b/meta/recipes-core/util-linux/util-linux/fix-configure.patch
deleted file mode 100644
index cefae97e9c..0000000000
--- a/meta/recipes-core/util-linux/util-linux/fix-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1The userlib_execdir was not getting set correctly, the quoting
2was wrong as these quoted items were not getting expanded correctly.
3
4Upstream-Status: Pending
5
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8Index: util-linux-2.24.1/configure.ac
9===================================================================
10--- util-linux-2.24.1.orig/configure.ac
11+++ util-linux-2.24.1/configure.ac
12@@ -76,7 +76,7 @@ fi
13 AC_SUBST([usrsbin_execdir])
14
15 AS_CASE([$libdir],
16- ['${exec_prefix}/'* | '${prefix}/'* | /usr/*],
17+ [${exec_prefix}/* | ${prefix}/* | /usr/*],
18 [usrlib_execdir=$libdir],
19 [usrlib_execdir='${exec_prefix}'$libdir]
20 )
diff --git a/meta/recipes-core/util-linux/util-linux/make_include b/meta/recipes-core/util-linux/util-linux/make_include
deleted file mode 100644
index e6abcd91f7..0000000000
--- a/meta/recipes-core/util-linux/util-linux/make_include
+++ /dev/null
@@ -1,17 +0,0 @@
1VERSION=2.12
2CC=gcc
3CFLAGS=
4LDFLAGS=
5HAVE_OLD_GCC=yes
6HAVE_RAW_H=yes
7HAVE_NCURSES=yes
8CURSESFLAGS=-DNCH=1
9LIBCURSES=-lncurses
10HAVE_TERMCAP=no
11NEED_LIBCRYPT=yes
12FOREIGN = --foreign-user
13HAVE_XGETTEXT=yes
14HAVE_OPENPTY=yes
15HAVE_PIVOT_ROOT=yes
16HAVE_GOOD_RPC=yes
17HAVE_ZLIB=yes
diff --git a/meta/recipes-core/util-linux/util-linux/swapargs.h b/meta/recipes-core/util-linux/util-linux/swapargs.h
deleted file mode 100644
index e960eef05f..0000000000
--- a/meta/recipes-core/util-linux/util-linux/swapargs.h
+++ /dev/null
@@ -1,3 +0,0 @@
1#define SWAPON_HAS_TWO_ARGS
2#include <asm/page.h>
3#include <sys/swap.h>
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch
deleted file mode 100644
index 8f26451aa8..0000000000
--- a/meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Pending
2
3util-linux: ensure the existence of directory for PATHFILES
4
5When compiling util-linux, it's possible to encounter the following error.
6 /bin/sh: line 2:: misc-utils/uuidd.8.tmp: No such file or directory
7
8This is because that the misc-utils directory doesn't exist when trying to write to
9misc-utils/uuidd.8.tmp.
10
11When generating misc-utils/uuidd.8 (or anything in PATHFILES), its directory
12may not have been created yet. So we need to ensure the existence of the directory
13to avoid the compilation error.
14
15Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
16---
17 Makefile.am | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/Makefile.am b/Makefile.am
21index 17f4c33..ca3dc0f 100644
22--- a/Makefile.am
23+++ b/Makefile.am
24@@ -123,6 +123,7 @@ EXTRA_DIST += $(PATHFILES:=.in)
25
26 $(PATHFILES): Makefile
27 @ rm -f $@ $@.tmp
28+ @ mkdir -p `dirname $@`
29 $(AM_V_GEN) srcdir=''; \
30 test -f ./$@.in || srcdir=$(srcdir)/; \
31 $(edit_cmd) $${srcdir}$@.in >$@.tmp
32--
331.7.9.5
34
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
index afe543c6e8..1f496dee21 100644
--- a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
+++ b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
@@ -16,24 +16,29 @@ Patches revert upstream changes in order to support older
16machines. 16machines.
17 17
18Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 18Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
19Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
20---
21 configure.ac | 1 +
22 include/c.h | 7 +++++++
23 2 files changed, 8 insertions(+)
19 24
20Index: util-linux-2.24.1/configure.ac 25diff --git a/configure.ac b/configure.ac
21=================================================================== 26index eb3680b..93e015f 100644
22--- util-linux-2.24.1.orig/configure.ac 27--- a/configure.ac
23+++ util-linux-2.24.1/configure.ac 28+++ b/configure.ac
24@@ -302,6 +302,7 @@ AC_CHECK_FUNCS([ \ 29@@ -318,6 +318,7 @@ AC_CHECK_FUNCS([ \
25 llseek \ 30 llseek \
26 lseek64 \ 31 lseek64 \
27 mempcpy \ 32 mempcpy \
28+ mkostemp \ 33+ mkostemp \
29 nanosleep \ 34 nanosleep \
35 open_memstream \
30 personality \ 36 personality \
31 posix_fadvise \ 37diff --git a/include/c.h b/include/c.h
32Index: util-linux-2.24.1/include/c.h 38index e423e8b..cf33b94 100644
33=================================================================== 39--- a/include/c.h
34--- util-linux-2.24.1.orig/include/c.h 40+++ b/include/c.h
35+++ util-linux-2.24.1/include/c.h 41@@ -233,6 +233,13 @@ static inline int dirfd(DIR *d)
36@@ -236,6 +236,13 @@ static inline int dirfd(DIR *d)
37 #endif 42 #endif
38 43
39 /* 44 /*
@@ -47,27 +52,6 @@ Index: util-linux-2.24.1/include/c.h
47 * MAXHOSTNAMELEN replacement 52 * MAXHOSTNAMELEN replacement
48 */ 53 */
49 static inline size_t get_hostname_max(void) 54 static inline size_t get_hostname_max(void)
50Index: util-linux-2.24.1/lib/randutils.c 55--
51=================================================================== 561.9.1
52--- util-linux-2.24.1.orig/lib/randutils.c 57
53+++ util-linux-2.24.1/lib/randutils.c
54@@ -16,6 +16,7 @@
55 #include <sys/syscall.h>
56
57 #include "randutils.h"
58+#include "c.h"
59
60 #ifdef HAVE_TLS
61 #define THREAD_LOCAL static __thread
62Index: util-linux-2.24.1/lib/wholedisk.c
63===================================================================
64--- util-linux-2.24.1.orig/lib/wholedisk.c
65+++ util-linux-2.24.1/lib/wholedisk.c
66@@ -10,6 +10,7 @@
67
68 #include "blkdev.h"
69 #include "wholedisk.h"
70+#include "c.h"
71
72 int is_whole_disk_fd(int fd, const char *name)
73 {
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
index f131b763ca..6717a75a90 100644
--- a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
+++ b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
@@ -1,27 +1,33 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Index: util-linux-2.22.1/login-utils/login.c 3Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
4=================================================================== 4---
5--- util-linux-2.22.1.orig/login-utils/login.c 5 login-utils/login.c | 5 ++++-
6+++ util-linux-2.22.1/login-utils/login.c 6 1 file changed, 4 insertions(+), 1 deletion(-)
7@@ -1239,6 +1239,8 @@ int main(int argc, char **argv) 7
8diff --git a/login-utils/login.c b/login-utils/login.c
9index ebb76f5..38c881b 100644
10--- a/login-utils/login.c
11+++ b/login-utils/login.c
12@@ -1110,6 +1110,7 @@ int main(int argc, char **argv)
8 char *buff; 13 char *buff;
9 int childArgc = 0; 14 int childArgc = 0;
10 int retcode; 15 int retcode;
11+ struct sigaction act; 16+ struct sigaction act;
12+
13 17
14 char *pwdbuf = NULL; 18 char *pwdbuf = NULL;
15 struct passwd *pwd = NULL, _pwd; 19 struct passwd *pwd = NULL, _pwd;
16@@ -1252,7 +1254,10 @@ int main(int argc, char **argv) 20@@ -1123,7 +1124,9 @@ int main(int argc, char **argv)
17 timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT); 21 timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
18 22
19 signal(SIGALRM, timedout); 23 signal(SIGALRM, timedout);
20- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioclt() */ 24- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioctl() */
21+ (void) sigaction(SIGALRM, NULL, &act); 25+ (void) sigaction(SIGALRM, NULL, &act);
22+ act.sa_flags &= ~SA_RESTART; 26+ act.sa_flags &= ~SA_RESTART;
23+ sigaction(SIGALRM, &act, NULL); 27+ sigaction(SIGALRM, &act, NULL);
24+
25 alarm(timeout); 28 alarm(timeout);
26 signal(SIGQUIT, SIG_IGN); 29 signal(SIGQUIT, SIG_IGN);
27 signal(SIGINT, SIG_IGN); 30 signal(SIGINT, SIG_IGN);
31--
321.9.1
33
diff --git a/meta/recipes-core/util-linux/util-linux_2.24.2.bb b/meta/recipes-core/util-linux/util-linux_2.25.2.bb
index ed753e48b3..697b9000c0 100644
--- a/meta/recipes-core/util-linux/util-linux_2.24.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.25.2.bb
@@ -1,4 +1,4 @@
1MAJOR_VERSION = "2.24" 1MAJOR_VERSION = "2.25"
2require util-linux.inc 2require util-linux.inc
3PR = "r1" 3PR = "r1"
4 4
@@ -13,14 +13,12 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
13 file://util-linux-ng-2.16-mount_lock_path.patch \ 13 file://util-linux-ng-2.16-mount_lock_path.patch \
14 file://uclibc-__progname-conflict.patch \ 14 file://uclibc-__progname-conflict.patch \
15 file://configure-sbindir.patch \ 15 file://configure-sbindir.patch \
16 file://fix-configure.patch \
17 file://fix-parallel-build.patch \ 16 file://fix-parallel-build.patch \
18 file://util-linux-ensure-the-existence-of-directory-for-PAT.patch \
19 ${OLDHOST} \ 17 ${OLDHOST} \
20" 18"
21 19
22SRC_URI[md5sum] = "3f191727a0d28f7204b755cf1b6ea0aa" 20SRC_URI[md5sum] = "cab3d7be354000f629bc601238b629b3"
23SRC_URI[sha256sum] = "1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0" 21SRC_URI[sha256sum] = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6"
24 22
25CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" 23CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
26 24
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-03 14:36:44 +0000