Update für util-linux und e2fsprogs. util-linux bringt das moderner blkid mit -

hier ist noch eine Umstellung im dmk file notwendig, da util-linux jetzt for e2fsprogs gebaut werden muss



git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5422 504e572c-2e33-0410-9681-be2bf7408885

BaseBuild/Basesys/Basesys.dmk

@@ -51,6 +51,7 @@
 16	Basesys/multiarch_wrapper
 16	Basesys/sed
 16	Basesys/binutils
+16	Basesys/pkgconfig
 16	Basesys/e2fsprogs
 16	Basesys/coreutils
 16	Basesys/m4
@@ -90,7 +91,6 @@
 16	Basesys/psmisc
 16	Basesys/shadow
 16	Basesys/sysklogd
-16	Basesys/pkgconfig
 16	Basesys/expat
 16	Basesys/libxml2
 16	Basesys/dbus

BaseBuild/Basesys/e2fsprogs

@@ -78,16 +78,21 @@ premk() {
 }
 
 mk32() {
+	gcc="gcc ${BUILDOPTIONS32}" \
 	CC="gcc ${BUILDOPTIONS32}" \
 	../e2fsprogs*/configure --prefix=/usr \
 				--with-root-prefix="" \
-				--enable-elf-shlibs \
-				--with-cc="gcc ${BUILDOPTIONS32}"
+				--enable-elf-shlibs  \
+				--disable-libblkid
 	make -j $NUMCPU
 	make -j $NUMCPU install
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make -j $NUMCPU install-libs
 	make -j $NUMCPU DESTDIR=$TMPROOT install-libs
+	if [ ! -d $TMPROOT/usr/lib ]; then
+		mkdir -p $TMPROOT/usr/lib
+	fi
+	mv $TMPROOT/lib/pkgconfig $TMPROOT/usr/lib
 	cd ../e2fsprogs*
 	rm -r ../build-e2fsprogs
 	mkdir ../build-e2fsprogs
@@ -101,11 +106,12 @@ mk() {
 	fi
 	cd -
 	gcc="gcc ${BUILDOPTIONS}" \
+	CC="gcc ${BUILDOPTIONS}" \
 	../e2fsprogs*/configure --prefix=/usr \
 				--libdir=/$LIBDIR \
 				--with-root-prefix="" \
 				--enable-elf-shlibs \
-				--with-cc="gcc ${BUILDOPTIONS}"
+				--disable-libblkid
 	make -j $NUMCPU 
 	make -j $NUMCPU install
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
@@ -113,6 +119,10 @@ mk() {
 	install-info $TMPROOT/usr/share/info/libext2fs.info \
 	             $TMPROOT/usr/share/info/dir
 	rm $TMPROOT/usr/info
+	if [ ! -d $TMPROOT/usr/$LIBDIR ]; then
+		mkdir -p $TMPROOT/usr/$LIBDIR
+	fi
+	mv $TMPROOT/$LIBDIR/pkgconfig $TMPROOT/usr/$LIBDIR
 }
 
 postmk() {

BaseBuild/Basesys/util-linux-ng

@@ -80,7 +80,8 @@ mk() {
 	./configure $ADDOPTIONS \
 		    --enable-partx \
 		    --disable-wall \
-		    --enable-write
+		    --enable-write \
+		    --with-fsprobe=builtin
 	make  -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	cd sys-utils