jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to util-linux-ng-2.16

Browse Source
This commit is contained in:
Stephan Raue 2009-07-20 02:08:26 +02:00
parent 3cbdd8bfb0
commit 9de2f04da9
5 changed files with 38 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/sysutils/util-linux-ng/build
View File

@ -3,14 +3,25 @@
. config/options
$SCRIPTS/build toolchain
$SCRIPTS/build ncurses
#$SCRIPTS/build ncurses
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--with-fsprobe=builtin
--disable-shared \
--enable-static \
--disable-libuuid
make -C libs/blkid
make -C shlibs/blkid
$MAKEINSTALL -C libs/blkid
mkdir -p $SYSROOT_PREFIX/usr/lib
cp -PR shlibs/blkid/src/.libs/libblkid.a $SYSROOT_PREFIX/usr/lib
mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
cp -PR shlibs/blkid/blkid.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
$SYSROOT_PREFIX/usr/lib/pkgconfig/blkid.pc
#$MAKEINSTALL -C shlibs/blkid

11
packages/sysutils/util-linux-ng/patches/util-linux-ng-2.15_missing_header.diff
View File

@ -1,11 +0,0 @@
diff -Naur util-linux-ng-2.15/libs/blkid/src/blkidP.h util-linux-ng-2.15.patch/libs/blkid/src/blkidP.h
--- util-linux-ng-2.15/libs/blkid/src/blkidP.h 2009-04-20 11:47:23.000000000 +0200
+++ util-linux-ng-2.15.patch/libs/blkid/src/blkidP.h 2009-05-13 01:21:17.353831636 +0200
@@ -18,6 +18,7 @@
#include <sys/types.h>
#include <stdio.h>
+#include <stdarg.h>
#include "bitops.h" /* $(top_srcdir)/include/ */
#include "blkid.h"

47
packages/sysutils/util-linux-ng/patches/util-linux-ng-2.15_remove_uuid.diff
View File

@ -1,47 +0,0 @@
diff -Naur util-linux-ng-2.15/libs/blkid/blkid.pc.in util-linux-ng-2.15.patch/libs/blkid/blkid.pc.in
--- util-linux-ng-2.15/libs/blkid/blkid.pc.in 2009-05-05 21:16:46.000000000 +0200
+++ util-linux-ng-2.15.patch/libs/blkid/blkid.pc.in 2009-05-13 01:31:30.223830997 +0200
@@ -6,6 +6,5 @@
Name: blkid
Description: Block device id library
Version: @LIBBLKID_VERSION@
-Requires.private: uuid
Cflags: -I${includedir}/blkid
Libs: -L${libdir} -lblkid
diff -Naur util-linux-ng-2.15/libs/blkid/src/config.c util-linux-ng-2.15.patch/libs/blkid/src/config.c
--- util-linux-ng-2.15/libs/blkid/src/config.c 2009-04-20 11:47:46.000000000 +0200
+++ util-linux-ng-2.15.patch/libs/blkid/src/config.c 2009-05-13 01:23:18.578582126 +0200
@@ -24,9 +24,6 @@
#include <errno.h>
#endif
#include <stdint.h>
-#ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
-#endif
#include <stdarg.h>
#include "blkdev.h"
diff -Naur util-linux-ng-2.15/libs/blkid/src/evaluate.c util-linux-ng-2.15.patch/libs/blkid/src/evaluate.c
--- util-linux-ng-2.15/libs/blkid/src/evaluate.c 2009-05-05 21:16:46.000000000 +0200
+++ util-linux-ng-2.15.patch/libs/blkid/src/evaluate.c 2009-05-13 01:23:30.362581321 +0200
@@ -27,9 +27,6 @@
#include <errno.h>
#endif
#include <stdint.h>
-#ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
-#endif
#include <stdarg.h>
#include "pathnames.h"
diff -Naur util-linux-ng-2.15/libs/blkid/src/read.c util-linux-ng-2.15.patch/libs/blkid/src/read.c
--- util-linux-ng-2.15/libs/blkid/src/read.c 2009-04-20 11:48:57.000000000 +0200
+++ util-linux-ng-2.15.patch/libs/blkid/src/read.c 2009-05-13 01:23:51.666581008 +0200
@@ -25,7 +25,6 @@
#endif
#include "blkidP.h"
-#include "uuid/uuid.h"
#ifdef HAVE_STRTOULL
#define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */

22
packages/sysutils/util-linux-ng/patches/util-linux-ng_remove_libuuid.diff Normal file
View File

@ -0,0 +1,22 @@
diff -Naur util-linux-ng-2.16/shlibs/blkid/blkid.pc util-linux-ng-2.16.patch/shlibs/blkid/blkid.pc
--- util-linux-ng-2.16/shlibs/blkid/blkid.pc 2009-07-16 01:18:03.000000000 +0200
+++ util-linux-ng-2.16.patch/shlibs/blkid/blkid.pc 2009-07-19 06:07:08.592182694 +0200
@@ -6,6 +6,6 @@
Name: blkid
Description: Block device id library
Version: 2.16.0
-Requires.private: uuid
+Requires.private:
Cflags: -I${includedir}/blkid
Libs: -L${libdir} -lblkid
diff -Naur util-linux-ng-2.16/shlibs/blkid/blkid.pc.in util-linux-ng-2.16.patch/shlibs/blkid/blkid.pc.in
--- util-linux-ng-2.16/shlibs/blkid/blkid.pc.in 2009-07-04 01:20:03.000000000 +0200
+++ util-linux-ng-2.16.patch/shlibs/blkid/blkid.pc.in 2009-07-19 06:07:16.846092573 +0200
@@ -6,6 +6,6 @@
Name: blkid
Description: Block device id library
Version: @LIBBLKID_VERSION@
-Requires.private: uuid
+Requires.private:
Cflags: -I${includedir}/blkid
Libs: -L${libdir} -lblkid

2
packages/sysutils/util-linux-ng/url
View File

@ -1 +1 @@
http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-2.15.tar.bz2
http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.16/util-linux-ng-2.16.tar.bz2