ports/core
4
3
Fork 0
Code Issues 3 Pull Requests Activity

util-linux-ng: update to 2.16-rc2

Browse Source
This commit is contained in:
Juergen Daubert 2009-07-04 19:30:36 +02:00
parent f5004dc91f
commit 0872031f7c
4 changed files with 118 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util-linux-ng/.footprint
View File

@ -7,10 +7,8 @@ drwxr-xr-x root/root bin/
drwxr-xr-x root/root etc/
-rw-r--r-- root/root etc/adjtime (EMPTY)
drwxr-xr-x root/root lib/
lrwxrwxrwx root/root lib/libblkid.so -> libblkid.so.1.0.0
lrwxrwxrwx root/root lib/libblkid.so.1 -> libblkid.so.1.0.0
-rwxr-xr-x root/root lib/libblkid.so.1.0.0
lrwxrwxrwx root/root lib/libuuid.so -> libuuid.so.1.0.0
lrwxrwxrwx root/root lib/libuuid.so.1 -> libuuid.so.1.0.0
-rwxr-xr-x root/root lib/libuuid.so.1.0.0
drwxr-xr-x root/root sbin/
@ -85,10 +83,10 @@ drwxr-xr-x root/root usr/include/uuid/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libblkid.a
-rwxr-xr-x root/root usr/lib/libblkid.la
lrwxrwxrwx root/root usr/lib/libblkid.so -> /lib/libblkid.so
lrwxrwxrwx root/root usr/lib/libblkid.so -> ../../lib/libblkid.so.1.0.0
-rw-r--r-- root/root usr/lib/libuuid.a
-rwxr-xr-x root/root usr/lib/libuuid.la
lrwxrwxrwx root/root usr/lib/libuuid.so -> /lib/libuuid.so
lrwxrwxrwx root/root usr/lib/libuuid.so -> ../../lib/libuuid.so.1.0.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/blkid.pc
-rw-r--r-- root/root usr/lib/pkgconfig/uuid.pc
@ -196,3 +194,5 @@ lrwxrwxrwx root/root usr/sbin/vidmode -> rdev
drwxr-xr-x root/root var/
drwxr-xr-x root/root var/lib/
drwxr-xr-x root/root var/lib/libuuid/
drwxr-xr-x root/root var/run/
drwxr-xr-x root/root var/run/uuidd/

3
util-linux-ng/.md5sum
View File

@ -1 +1,2 @@
5199169973002e50a6acc9a993894771 util-linux-ng-2.16-rc1.tar.bz2
5816827eeebdbe8d3fe3983d0fc3bcfd util-linux-ng-2.16-rc2-install-hook.patch
9de0a82e814b8f14483d5f9fae9aeff1 util-linux-ng-2.16-rc2.tar.bz2

23
util-linux-ng/Pkgfile
View File

@ -4,27 +4,28 @@
# Depends on: ncurses zlib
name=util-linux-ng
version=2.16-rc1
release=2
source=(http://ftp.kernel.org/pub/linux/utils/$name/v2.16/$name-$version.tar.bz2)
version=2.16-rc2
release=1
source=(http://ftp.kernel.org/pub/linux/utils/$name/v2.16/$name-$version.tar.bz2
$name-$version-install-hook.patch)
build() {
cd $name-$version
patch -p1 -i $SRC/$name-$version-install-hook.patch
aclocal
automake
./configure --prefix=/usr \
--libdir=/usr/lib \
--mandir=/usr/man \
--disable-{nls,wall} \
--enable-{write,rdev,raw,kill}
make -j1
make DESTDIR=$PKG install
make -j1 DESTDIR=$PKG install
install -d $PKG/lib
mv $PKG/usr/lib/lib*.so* $PKG/lib
ln -s /lib/libblkid.so $PKG/usr/lib/libblkid.so
ln -s /lib/libuuid.so $PKG/usr/lib/libuuid.so
install -d $PKG/{etc,var/lib/libuuid}
install -d $PKG/etc
install -d $PKG/var/{lib/libuuid,run/uuidd}
touch $PKG/etc/adjtime
rm -r $PKG/usr/share

100
util-linux-ng/util-linux-ng-2.16-rc2-install-hook.patch Normal file
View File

@ -0,0 +1,100 @@
# http://www.spinics.net/lists/util-linux-ng/msg02369.html
diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index 5ed581b..d91a5eb 100644
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
@@ -124,6 +124,8 @@ install-exec-hook::
cd $(DESTDIR)$(sbindir) && ln -sf initctl need
cd $(DESTDIR)$(sbindir) && ln -sf initctl display-services
cd $(DESTDIR)$(sbindir) && ln -sf initctl provide
+
+install-data-hook:
cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 need.8
cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 display-services.8
cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 provide.8
diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
index 8b1f46b..8129d28 100644
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS += -I$(ul_libblkid_srcdir) $(common_cflags)
blkidincdir = $(includedir)/blkid
blkidinc_HEADERS = blkid.h
-lib_LTLIBRARIES = libblkid.la
+usrlibexec_LTLIBRARIES = libblkid.la
libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c \
probe.c read.c resolve.c save.c tag.c version.c verify.c \
encode.c blkid.h list.h blkidP.h probers/probers.h \
@@ -49,19 +49,17 @@ test_%: %.c
$(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(common_ldadd)
-# move devel files from $(libdir) to $(usrlibexecdir) if needed
-install-data-hook:
- rm $(DESTDIR)$(libdir)/$(lib_LTLIBRARIES)
+# move lib from $(usrlibexecdir) to $(libdir) if needed
+install-exec-hook:
if test "$(usrlibexecdir)" != "$(libdir)"; then \
- mkdir -p $(DESTDIR)$(usrlibexecdir); \
- mv $(DESTDIR)$(libdir)/libblkid.a $(DESTDIR)$(usrlibexecdir)/; \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libblkid.so); \
- rm $(DESTDIR)$(libdir)/libblkid.so; \
+ mkdir -p $(DESTDIR)$(libdir); \
+ mv $(DESTDIR)$(usrlibexecdir)/libblkid.so.* $(DESTDIR)$(libdir); \
+ so_img_name=$$(readlink $(DESTDIR)$(usrlibexecdir)/libblkid.so); \
so_img_rel_target=$$(echo $(usrlibexecdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
- ln -sf $$so_img_rel_target$(libdir)/$$so_img_name \
- $(DESTDIR)$(usrlibexecdir)/libblkid.so; \
+ (cd $(DESTDIR)$(usrlibexecdir) && \
+ rm -f libblkid.so && \
+ $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \
fi
uninstall-hook:
- rm -f $(DESTDIR)$(usrlibexecdir)/libblkid.a
- rm -f $(DESTDIR)$(usrlibexecdir)/libblkid.so*
+ rm -f $(DESTDIR)$(libdir)/libblkid.so*
diff --git a/shlibs/uuid/src/Makefile.am b/shlibs/uuid/src/Makefile.am
index fff1152..81aa186 100644
--- a/shlibs/uuid/src/Makefile.am
+++ b/shlibs/uuid/src/Makefile.am
@@ -10,7 +10,7 @@ tst_uuid_CFLAGS = -I$(ul_libuuid_srcdir)
uuidincdir = $(includedir)/uuid
uuidinc_HEADERS = uuid.h
-lib_LTLIBRARIES = libuuid.la
+usrlibexec_LTLIBRARIES = libuuid.la
libuuid_la_SOURCES = clear.c compare.c copy.c gen_uuid.c \
isnull.c pack.c parse.c unpack.c unparse.c uuidd.h \
uuidd.h uuidP.h uuid_time.c $(uuidinc_HEADERS)
@@ -30,20 +30,18 @@ test_%: %.c
$(COMPILE) -DTEST_PROGRAM $< .libs/libuuid.a -o $@
-# move devel files from $(libdir) to $(usrlibexecdir) if needed
-install-data-hook:
- rm $(DESTDIR)$(libdir)/$(lib_LTLIBRARIES)
+# move lib from $(usrlibexecdir) to $(libdir) if needed
+install-exec-hook:
if test "$(usrlibexecdir)" != "$(libdir)"; then \
- mkdir -p $(DESTDIR)$(usrlibexecdir); \
- mv $(DESTDIR)$(libdir)/libuuid.a $(DESTDIR)$(usrlibexecdir)/; \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libuuid.so); \
- rm $(DESTDIR)$(libdir)/libuuid.so; \
+ mkdir -p $(DESTDIR)$(libdir); \
+ mv $(DESTDIR)$(usrlibexecdir)/libuuid.so.* $(DESTDIR)$(libdir); \
+ so_img_name=$$(readlink $(DESTDIR)$(usrlibexecdir)/libuuid.so); \
so_img_rel_target=$$(echo $(usrlibexecdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
- ln -sf $$so_img_rel_target$(libdir)/$$so_img_name \
- $(DESTDIR)$(usrlibexecdir)/libuuid.so; \
+ (cd $(DESTDIR)$(usrlibexecdir) && \
+ rm -f libuuid.so && \
+ $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libuuid.so); \
fi
uninstall-hook:
- rm -f $(DESTDIR)$(usrlibexecdir)/libuuid.a
- rm -f $(DESTDIR)$(usrlibexecdir)/libuuid.so*
+ rm -f $(DESTDIR)$(libdir)/libuuid.so*