From 0b3c646d61799266dd07df9a4efb21232cc053fb Mon Sep 17 00:00:00 2001 From: kueller Date: Thu, 3 Mar 2011 11:24:27 +0000 Subject: [PATCH] Anpassungen an V963, Einarbeitung der neuesten CLFS Version git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6017 504e572c-2e33-0410-9681-be2bf7408885 --- BaseBuild/Basesys/Basesys.dmk | 3 +- BaseBuild/Basesys/bison | 6 +-- BaseBuild/Basesys/coreutils | 9 ++++ BaseBuild/Basesys/e2fsprogs | 52 ++++++++----------- BaseBuild/Basesys/libtool | 12 ++--- BaseBuild/Basesys/pkgconfig | 21 ++++---- BaseBuild/Basesys/procps | 8 +-- .../Basesys/{util-linux-ng => util-linux} | 34 ++++-------- 8 files changed, 61 insertions(+), 84 deletions(-) rename BaseBuild/Basesys/{util-linux-ng => util-linux} (83%) diff --git a/BaseBuild/Basesys/Basesys.dmk b/BaseBuild/Basesys/Basesys.dmk index b768b4e..933b061 100644 --- a/BaseBuild/Basesys/Basesys.dmk +++ b/BaseBuild/Basesys/Basesys.dmk @@ -55,7 +55,7 @@ 16 Basesys/sed 16 Basesys/ncurses 16 Basesys/pkgconfig -16 Basesys/util-linux-ng +16 Basesys/util-linux 16 Basesys/e2fsprogs 16 Basesys/coreutils 16 Basesys/m4 @@ -90,6 +90,7 @@ 16 Basesys/vim 16 Basesys/subversion 22 Basesys/pkgconfig +22 Basesys/procps 22 Basesys/iproute2 16 Basesys/vim 16 Basesys/Linux-PAM diff --git a/BaseBuild/Basesys/bison b/BaseBuild/Basesys/bison index e7571e8..bfedd1e 100644 --- a/BaseBuild/Basesys/bison +++ b/BaseBuild/Basesys/bison @@ -82,14 +82,10 @@ mk32() { } mk() { - if [ ${MK64BIT} == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc ${BUILDOPTIONS}" - ./configure $ADDOPTIONS \ + ./configure --libdir=\${prefix}/${LIBDIR} \ --prefix=/usr && make -j $NUMCPU && - MakeCheck -j $NUMCPU check && make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/BaseBuild/Basesys/coreutils b/BaseBuild/Basesys/coreutils index 7e5e6e6..fde00ac 100644 --- a/BaseBuild/Basesys/coreutils +++ b/BaseBuild/Basesys/coreutils @@ -82,6 +82,15 @@ mk() { --enable-no-install-program=kill,uptime \ --enable-install-program=hostname make -j $NUMCPU + if [ "$CHECK" == "true" ]; then + echo "dummy1:x:1000:" >> /etc/group + echo "dummy2:x:1001:dummy" >> /etc/group + echo "dummy:x:1000:1000::/root:/bin/bash" >> /etc/passwd + MakeCheck NON_ROOT_USERNAME=dummy check-root + chown -Rv dummy config.log {gnulib-tests,lib,src}/.deps + src/su dummy -c "make RUN_EXPENSIVE_TESTS=yes check" + sed -i '/dummy/d' /etc/passwd /etc/group + fi make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/BaseBuild/Basesys/e2fsprogs b/BaseBuild/Basesys/e2fsprogs index aa2a2ad..8edc9c0 100644 --- a/BaseBuild/Basesys/e2fsprogs +++ b/BaseBuild/Basesys/e2fsprogs @@ -70,57 +70,50 @@ SRCPATH=Base/System premk() { mkdir -p $TMPROOT/usr/share/info - cd $TMPROOT/usr - ln -s share/info info - cd - - mkdir ../build-e2fsprogs - cd ../build-e2fsprogs + ln -s share/info $TMPROOT/usr/info + mkdir build + cd build } mk32() { CC="gcc ${BUILDOPTIONS32}" \ LDFLAGS="-luuid -lblkid" \ - ../e2fsprogs*/configure --prefix=/usr \ - --with-root-prefix="" \ - --enable-elf-shlibs \ - --disable-libblkid \ - --disable-libuuid - make -j $NUMCPU - make -j $NUMCPU install - make -j $NUMCPU DESTDIR=$TMPROOT install + ../configure --prefix=/usr \ + --with-root-prefix="" \ + --enable-elf-shlibs \ + --disable-libblkid \ + --disable-libuuid \ + --disable-fsck \ + --disable-uuidd + make -j $NUMCPU libs 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 - cd ../build-e2fsprogs + cd .. + rm -r build + mkdir build + cd build } mk() { - cd ../e2fsprogs* if [ "$MK64BIT" == "true" ]; then - sed -i '/libdir=.*\/lib/s@/lib@/lib64@g' configure + sed -i '/libdir.*=.*\/lib/s@/lib@/lib64@g' ../configure fi - cd - CC="gcc ${BUILDOPTIONS}" \ LDFLAGS="-luuid -lblkid" \ - ../e2fsprogs*/configure --prefix=/usr \ - --libdir=/$LIBDIR \ - --with-root-prefix="" \ - --enable-elf-shlibs \ - --disable-libblkid \ - --disable-libuuid + ../configure --prefix=/usr \ + --libdir=/$LIBDIR \ + --with-root-prefix="" \ + --enable-elf-shlibs \ + --disable-libblkid \ + --disable-libuuid make -j $NUMCPU make -j $NUMCPU install make -j $NUMCPU DESTDIR=$TMPROOT install make -j $NUMCPU DESTDIR=$TMPROOT install-libs - 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 @@ -130,5 +123,4 @@ mk() { postmk() { mkdir -p $TMPROOT/usr/share mv $TMPROOT/usr/man $TMPROOT/usr/share - rm -r $MAKEDIR/build-e2fsprogs } diff --git a/BaseBuild/Basesys/libtool b/BaseBuild/Basesys/libtool index 4fe9e3f..7950d08 100644 --- a/BaseBuild/Basesys/libtool +++ b/BaseBuild/Basesys/libtool @@ -72,7 +72,6 @@ SRCPATH=Base/System premk() { mkdir ../build-libtool cd ../build-libtool - ln -sf /tools/bin/grep /bin/grep } mk32() { @@ -81,6 +80,7 @@ mk32() { ../libtool*/configure --prefix=/usr \ --cache-file=config.cache make -j $NUMCPU + MakeCheck -j $NUMCPU LDEMULATION=elf_i386 check make -j $NUMCPU DESTDIR=$TMPROOT install sed -i "s/\/tools\/bin\/grep/\/bin\/grep/" $TMPROOT/usr/bin/libtool mv -v $TMPROOT/usr/bin/libtool{,-32} @@ -92,14 +92,12 @@ mk32() { mk() { echo "lt_cv_sys_dlsearch_path='/lib64 /usr/lib64 /usr/local/lib64 /opt/lib64'" > config.cache - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/lib64" - fi CC="gcc ${BUILDOPTIONS}"\ - ../libtool*/configure $ADDOPTIONS \ - --prefix=/usr \ - --cache-file=config.cache + ../libtool*/configure --libdir=/usr/${LIBDIR} \ + --prefix=/usr \ + --cache-file=config.cache make -j $NUMCPU + MakeCheck -j $NUMCPU check make -j $NUMCPU DESTDIR=$TMPROOT install sed -i "s/\/tools\/bin\/grep/\/bin\/grep/" $TMPROOT/usr/bin/libtool if [ "$MK64BIT" == "true" ]; then diff --git a/BaseBuild/Basesys/pkgconfig b/BaseBuild/Basesys/pkgconfig index 5bd096c..e0610ce 100644 --- a/BaseBuild/Basesys/pkgconfig +++ b/BaseBuild/Basesys/pkgconfig @@ -88,16 +88,10 @@ premk() { } mk() { - # Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen. - # Den \ nicht vergessen ! - ../pkgconfig*/configure --build=$TARGET \ - --target=$TARGET \ - --prefix=/usr - - CheckError "Configurescript failed !" 1 - - # Make-Optionen eintragen - USE_ARCH=$UARCH CC="gcc ${BUILDOPTIONS}" ./configure --prefix=/usr --with-pc-path=/usr/share/pkgconfig && + USE_ARCH=$UARCH \ + CC="gcc ${BUILDOPTIONS}" \ + ../pkgconfig*/configure --prefix=/usr \ + --with-pc-path=/usr/share/pkgconfig make -j $NUMCPU CheckError "Makeprocess failed !" 1 @@ -109,8 +103,13 @@ mk() { postmk() { cd ../pkgconfig* rm -r ../Build-pkgconfig - GetSVN Viitor_pkgconfig $TMPROOT + if [ -d /var/install/subversion* ]; then + GetSVN Viitor_pkgconfig $TMPROOT + fi mkdir -p $TMPROOT/usr/share mv $TMPROOT/usr/man $TMPROOT/usr/share/man ln -s pkg-config $TMPROOT/usr/bin/pkgconfig + if [ ! -d /var/install/pkgconfig* ]; then + echo "export PKG_CONFIG_PATH=\"/usr/${LIBDIR}/pkgconfig\"" >>/root/.bash_profile + fi } diff --git a/BaseBuild/Basesys/procps b/BaseBuild/Basesys/procps index 2f86633..8120379 100644 --- a/BaseBuild/Basesys/procps +++ b/BaseBuild/Basesys/procps @@ -69,8 +69,7 @@ SRCPATH=Base/System premk() { - sed -e "s/-O3/$CFLAGS/" Makefile >Makefile2 - mv Makefile2 Makefile + sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' Makefile } mk32() { @@ -80,11 +79,8 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="lib64=lib64" - fi make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" m64="" - make -j $NUMCPU DESTDIR=$TMPROOT install $ADDOPTIONS + make -j $NUMCPU DESTDIR=$TMPROOT install lib64=${LIBDIR} } postmk() { diff --git a/BaseBuild/Basesys/util-linux-ng b/BaseBuild/Basesys/util-linux similarity index 83% rename from BaseBuild/Basesys/util-linux-ng rename to BaseBuild/Basesys/util-linux index aeca0b7..6efc422 100644 --- a/BaseBuild/Basesys/util-linux-ng +++ b/BaseBuild/Basesys/util-linux @@ -69,11 +69,13 @@ SRCPATH=Base/System premk() { - sed -i 's%etc/adjtime%var/lib/hwclock/adjtime%' hwclock/hwclock.c + sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \ + hwclock/hwclock.c + mkdir -pv $TMPROOT/var/lib/hwclock } mk32() { - CC="gcc ${BUILDOPTIONS32} -L/lib64 -L/usr/lib64" \ + CC="gcc ${BUILDOPTIONS32}" \ ./configure --enable-partx \ --disable-wall \ --enable-write @@ -83,38 +85,22 @@ mk32() { } mk() { - if [ ${MK64BIT} == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi - CC="gcc ${BUILDOPTIONS} -L/lib64 -L/usr/lib64" \ - ./configure $ADDOPTIONS \ + CC="gcc ${BUILDOPTIONS}" \ + ./configure --libdir=/${LIBDIR} \ --enable-partx \ --disable-wall \ --enable-write make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install - cd sys-utils - make rdev - cp rdev $TMPROOT/usr/sbin - cd - + #cd sys-utils + #make rdev + #cp rdev $TMPROOT/usr/sbin + #cd - } postmk() { - mkdir -p $TMPROOT/var/lib/hwclock if [ ! -d $TMPROOT/bin ]; then mkdir -p $TMPROOT/bin fi mv $TMPROOT/usr/bin/logger $TMPROOT/bin - if [ "$MK64BIT" == "true" ]; then - if [ ! -d $TMPROOT/lib64 ]; then - mkdir $TMPROOT/lib64 - fi - mv $TMPROOT/usr/lib64/libblkid.so* $TMPROOT/lib64 - mv $TMPROOT/usr/lib64/libuuid.so* $TMPROOT/lib64 - cd $TMPROOT/usr/lib64 - ln -s ../../lib64/libblkid.so.1.* libblkid.so.1 - ln -s ../../lib64/libblkid.so.1.* libblkid.so - ln -s ../../lib64/libuuid.so.1.* libuuid.so.1 - ln -s ../../lib64/libuuid.so.1.* libuuid.so - fi }