diff --git a/packages/sysutils/hal/build b/packages/sysutils/hal/build index d8aae94e58..cfa4c1f65f 100755 --- a/packages/sysutils/hal/build +++ b/packages/sysutils/hal/build @@ -10,15 +10,12 @@ $SCRIPTS/build expat $SCRIPTS/build glib $SCRIPTS/build dbus $SCRIPTS/build dbus-glib +$SCRIPTS/build util-linux-ng export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include" export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib" cd $BUILD/$1* -# --exec-prefix=/usr \ -# --datadir=/usr/share \ -# --localstatedir=/var \ - ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/sysutils/hal/url b/packages/sysutils/hal/url index 2527e10b70..40b06eb563 100644 --- a/packages/sysutils/hal/url +++ b/packages/sysutils/hal/url @@ -1 +1 @@ -http://hal.freedesktop.org/releases/hal-0.5.12rc1.tar.bz2 +http://hal.freedesktop.org/releases/hal-0.5.12.tar.bz2 diff --git a/packages/sysutils/util-linux-ng/build b/packages/sysutils/util-linux-ng/build new file mode 100755 index 0000000000..14c6a814ca --- /dev/null +++ b/packages/sysutils/util-linux-ng/build @@ -0,0 +1,15 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain + +cd $BUILD/$1* +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --with-fsprobe=builtin + +make -C libs/blkid + +$MAKEINSTALL -C libs/blkid diff --git a/packages/sysutils/util-linux-ng/patches/util-linux-ng-2.15_missing_header.diff b/packages/sysutils/util-linux-ng/patches/util-linux-ng-2.15_missing_header.diff new file mode 100644 index 0000000000..8aea1adf7f --- /dev/null +++ b/packages/sysutils/util-linux-ng/patches/util-linux-ng-2.15_missing_header.diff @@ -0,0 +1,11 @@ +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 + #include ++#include + + #include "bitops.h" /* $(top_srcdir)/include/ */ + #include "blkid.h" diff --git a/packages/sysutils/util-linux-ng/patches/util-linux-ng-2.15_remove_uuid.diff b/packages/sysutils/util-linux-ng/patches/util-linux-ng-2.15_remove_uuid.diff new file mode 100644 index 0000000000..093c1ca156 --- /dev/null +++ b/packages/sysutils/util-linux-ng/patches/util-linux-ng-2.15_remove_uuid.diff @@ -0,0 +1,47 @@ +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 + #endif + #include +-#ifdef HAVE_LIBUUID +-#include +-#endif + #include + + #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 + #endif + #include +-#ifdef HAVE_LIBUUID +-#include +-#endif + #include + + #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 */ diff --git a/packages/sysutils/util-linux-ng/url b/packages/sysutils/util-linux-ng/url new file mode 100644 index 0000000000..d73645c98a --- /dev/null +++ b/packages/sysutils/util-linux-ng/url @@ -0,0 +1 @@ +http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-2.15.tar.bz2 \ No newline at end of file