CompuExtreme/ViitorMake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Anpassungen an V963, Einarbeitung der neuesten CLFS Version

Browse Source 
git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6017 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2011-03-03 11:24:27 +00:00
parent 66e6e3f8f9
commit 0b3c646d61
8 changed files with 61 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BaseBuild/Basesys/Basesys.dmk
View File

@ -55,7 +55,7 @@
16 Basesys/sed 16 Basesys/sed
16 Basesys/ncurses 16 Basesys/ncurses
16 Basesys/pkgconfig 16 Basesys/pkgconfig
16 Basesys/util-linux-ng 16 Basesys/util-linux
16 Basesys/e2fsprogs 16 Basesys/e2fsprogs
16 Basesys/coreutils 16 Basesys/coreutils
16 Basesys/m4 16 Basesys/m4
@ -90,6 +90,7 @@
16 Basesys/vim 16 Basesys/vim
16 Basesys/subversion 16 Basesys/subversion
22 Basesys/pkgconfig 22 Basesys/pkgconfig
22 Basesys/procps
22 Basesys/iproute2 22 Basesys/iproute2
16 Basesys/vim 16 Basesys/vim
16 Basesys/Linux-PAM 16 Basesys/Linux-PAM

6
BaseBuild/Basesys/bison
View File

@ -82,14 +82,10 @@ mk32() {
} }
mk() { mk() {
if [ ${MK64BIT} == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
fi
CC="gcc ${BUILDOPTIONS}" CC="gcc ${BUILDOPTIONS}"
./configure $ADDOPTIONS \ ./configure --libdir=\${prefix}/${LIBDIR} \
--prefix=/usr && --prefix=/usr &&
make -j $NUMCPU && make -j $NUMCPU &&
MakeCheck -j $NUMCPU check &&
make -j $NUMCPU DESTDIR=$TMPROOT install make -j $NUMCPU DESTDIR=$TMPROOT install
} }

9
BaseBuild/Basesys/coreutils
View File

@ -82,6 +82,15 @@ mk() {
--enable-no-install-program=kill,uptime \ --enable-no-install-program=kill,uptime \
--enable-install-program=hostname --enable-install-program=hostname
make -j $NUMCPU 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 make -j $NUMCPU DESTDIR=$TMPROOT install
} }

52
BaseBuild/Basesys/e2fsprogs
View File

@ -70,57 +70,50 @@ SRCPATH=Base/System
premk() { premk() {
mkdir -p $TMPROOT/usr/share/info mkdir -p $TMPROOT/usr/share/info
cd $TMPROOT/usr ln -s share/info $TMPROOT/usr/info
ln -s share/info info mkdir build
cd - cd build
mkdir ../build-e2fsprogs
cd ../build-e2fsprogs
} }
mk32() { mk32() {
CC="gcc ${BUILDOPTIONS32}" \ CC="gcc ${BUILDOPTIONS32}" \
LDFLAGS="-luuid -lblkid" \ LDFLAGS="-luuid -lblkid" \
../e2fsprogs*/configure --prefix=/usr \ ../configure --prefix=/usr \
--with-root-prefix="" \ --with-root-prefix="" \
--enable-elf-shlibs \ --enable-elf-shlibs \
--disable-libblkid \ --disable-libblkid \
--disable-libuuid --disable-libuuid \
make -j $NUMCPU --disable-fsck \
make -j $NUMCPU install --disable-uuidd
make -j $NUMCPU DESTDIR=$TMPROOT install make -j $NUMCPU libs
make -j $NUMCPU install-libs make -j $NUMCPU install-libs
make -j $NUMCPU DESTDIR=$TMPROOT install-libs make -j $NUMCPU DESTDIR=$TMPROOT install-libs
if [ ! -d $TMPROOT/usr/lib ]; then if [ ! -d $TMPROOT/usr/lib ]; then
mkdir -p $TMPROOT/usr/lib mkdir -p $TMPROOT/usr/lib
fi fi
mv $TMPROOT/lib/pkgconfig $TMPROOT/usr/lib mv $TMPROOT/lib/pkgconfig $TMPROOT/usr/lib
cd ../e2fsprogs* cd ..
rm -r ../build-e2fsprogs rm -r build
mkdir ../build-e2fsprogs mkdir build
cd ../build-e2fsprogs cd build
} }
mk() { mk() {
cd ../e2fsprogs*
if [ "$MK64BIT" == "true" ]; then if [ "$MK64BIT" == "true" ]; then
sed -i '/libdir=.*\/lib/s@/lib@/lib64@g' configure sed -i '/libdir.*=.*\/lib/s@/lib@/lib64@g' ../configure
fi fi
cd -
CC="gcc ${BUILDOPTIONS}" \ CC="gcc ${BUILDOPTIONS}" \
LDFLAGS="-luuid -lblkid" \ LDFLAGS="-luuid -lblkid" \
../e2fsprogs*/configure --prefix=/usr \ ../configure --prefix=/usr \
--libdir=/$LIBDIR \ --libdir=/$LIBDIR \
--with-root-prefix="" \ --with-root-prefix="" \
--enable-elf-shlibs \ --enable-elf-shlibs \
--disable-libblkid \ --disable-libblkid \
--disable-libuuid --disable-libuuid
make -j $NUMCPU make -j $NUMCPU
make -j $NUMCPU install make -j $NUMCPU install
make -j $NUMCPU DESTDIR=$TMPROOT install make -j $NUMCPU DESTDIR=$TMPROOT install
make -j $NUMCPU DESTDIR=$TMPROOT install-libs 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 if [ ! -d $TMPROOT/usr/$LIBDIR ]; then
mkdir -p $TMPROOT/usr/$LIBDIR mkdir -p $TMPROOT/usr/$LIBDIR
fi fi
@ -130,5 +123,4 @@ mk() {
postmk() { postmk() {
mkdir -p $TMPROOT/usr/share mkdir -p $TMPROOT/usr/share
mv $TMPROOT/usr/man $TMPROOT/usr/share mv $TMPROOT/usr/man $TMPROOT/usr/share
rm -r $MAKEDIR/build-e2fsprogs
} }

12
BaseBuild/Basesys/libtool
View File

@ -72,7 +72,6 @@ SRCPATH=Base/System
premk() { premk() {
mkdir ../build-libtool mkdir ../build-libtool
cd ../build-libtool cd ../build-libtool
ln -sf /tools/bin/grep /bin/grep
} }
mk32() { mk32() {
@ -81,6 +80,7 @@ mk32() {
../libtool*/configure --prefix=/usr \ ../libtool*/configure --prefix=/usr \
--cache-file=config.cache --cache-file=config.cache
make -j $NUMCPU make -j $NUMCPU
MakeCheck -j $NUMCPU LDEMULATION=elf_i386 check
make -j $NUMCPU DESTDIR=$TMPROOT install make -j $NUMCPU DESTDIR=$TMPROOT install
sed -i "s/\/tools\/bin\/grep/\/bin\/grep/" $TMPROOT/usr/bin/libtool sed -i "s/\/tools\/bin\/grep/\/bin\/grep/" $TMPROOT/usr/bin/libtool
mv -v $TMPROOT/usr/bin/libtool{,-32} mv -v $TMPROOT/usr/bin/libtool{,-32}
@ -92,14 +92,12 @@ mk32() {
mk() { mk() {
echo "lt_cv_sys_dlsearch_path='/lib64 /usr/lib64 /usr/local/lib64 /opt/lib64'" > config.cache 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}"\ CC="gcc ${BUILDOPTIONS}"\
../libtool*/configure $ADDOPTIONS \ ../libtool*/configure --libdir=/usr/${LIBDIR} \
--prefix=/usr \ --prefix=/usr \
--cache-file=config.cache --cache-file=config.cache
make -j $NUMCPU make -j $NUMCPU
MakeCheck -j $NUMCPU check
make -j $NUMCPU DESTDIR=$TMPROOT install make -j $NUMCPU DESTDIR=$TMPROOT install
sed -i "s/\/tools\/bin\/grep/\/bin\/grep/" $TMPROOT/usr/bin/libtool sed -i "s/\/tools\/bin\/grep/\/bin\/grep/" $TMPROOT/usr/bin/libtool
if [ "$MK64BIT" == "true" ]; then if [ "$MK64BIT" == "true" ]; then

21
BaseBuild/Basesys/pkgconfig
View File

@ -88,16 +88,10 @@ premk() {
} }
mk() { mk() {
# Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen. USE_ARCH=$UARCH \
# Den \ nicht vergessen ! CC="gcc ${BUILDOPTIONS}" \
../pkgconfig*/configure --build=$TARGET \ ../pkgconfig*/configure --prefix=/usr \
--target=$TARGET \ --with-pc-path=/usr/share/pkgconfig
--prefix=/usr
CheckError "Configurescript failed !" 1
# Make-Optionen eintragen
USE_ARCH=$UARCH CC="gcc ${BUILDOPTIONS}" ./configure --prefix=/usr --with-pc-path=/usr/share/pkgconfig &&
make -j $NUMCPU make -j $NUMCPU
CheckError "Makeprocess failed !" 1 CheckError "Makeprocess failed !" 1
@ -109,8 +103,13 @@ mk() {
postmk() { postmk() {
cd ../pkgconfig* cd ../pkgconfig*
rm -r ../Build-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 mkdir -p $TMPROOT/usr/share
mv $TMPROOT/usr/man $TMPROOT/usr/share/man mv $TMPROOT/usr/man $TMPROOT/usr/share/man
ln -s pkg-config $TMPROOT/usr/bin/pkgconfig 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
} }

8
BaseBuild/Basesys/procps
View File

@ -69,8 +69,7 @@
SRCPATH=Base/System SRCPATH=Base/System
premk() { premk() {
sed -e "s/-O3/$CFLAGS/" Makefile >Makefile2 sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' Makefile
mv Makefile2 Makefile
} }
mk32() { mk32() {
@ -80,11 +79,8 @@ mk32() {
} }
mk() { mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="lib64=lib64"
fi
make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" m64="" make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" m64=""
make -j $NUMCPU DESTDIR=$TMPROOT install $ADDOPTIONS make -j $NUMCPU DESTDIR=$TMPROOT install lib64=${LIBDIR}
} }
postmk() { postmk() {

34
BaseBuild/Basesys/util-linux-ng → BaseBuild/Basesys/util-linux
View File

@ -69,11 +69,13 @@
SRCPATH=Base/System SRCPATH=Base/System
premk() { 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() { mk32() {
CC="gcc ${BUILDOPTIONS32} -L/lib64 -L/usr/lib64" \ CC="gcc ${BUILDOPTIONS32}" \
./configure --enable-partx \ ./configure --enable-partx \
--disable-wall \ --disable-wall \
--enable-write --enable-write
@ -83,38 +85,22 @@ mk32() {
} }
mk() { mk() {
if [ ${MK64BIT} == "true" ]; then CC="gcc ${BUILDOPTIONS}" \
ADDOPTIONS="--libdir=\${prefix}/lib64" ./configure --libdir=/${LIBDIR} \
fi
CC="gcc ${BUILDOPTIONS} -L/lib64 -L/usr/lib64" \
./configure $ADDOPTIONS \
--enable-partx \ --enable-partx \
--disable-wall \ --disable-wall \
--enable-write --enable-write
make -j $NUMCPU make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install make -j $NUMCPU DESTDIR=$TMPROOT install
cd sys-utils #cd sys-utils
make rdev #make rdev
cp rdev $TMPROOT/usr/sbin #cp rdev $TMPROOT/usr/sbin
cd - #cd -
} }
postmk() { postmk() {
mkdir -p $TMPROOT/var/lib/hwclock
if [ ! -d $TMPROOT/bin ]; then if [ ! -d $TMPROOT/bin ]; then
mkdir -p $TMPROOT/bin mkdir -p $TMPROOT/bin
fi fi
mv $TMPROOT/usr/bin/logger $TMPROOT/bin 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
} }