diff --git a/SysBuild/BuildCluster/Tools.dmk b/SysBuild/BuildCluster/Tools.dmk index 8efc321..14929f2 100644 --- a/SysBuild/BuildCluster/Tools.dmk +++ b/SysBuild/BuildCluster/Tools.dmk @@ -1,18 +1,31 @@ -0 tools/mono -0 tools/tin +0 development/mono +0 network/tin 0 tools/mc 0 tools/PolicyKit 0 tools/ConsoleKit 0 tools/hal +0 network/tcpdump +0 network/vtun +0 network/irssi +0 development/ExtUtils-F77 +0 development/XML-Simple +0 development/XML-SAX-Base +0 development/URI +0 development/Convert-ASN1 +0 development/Digest-HMAC +0 development/Authen-SASL +0 development/IO-Socket-SSL +0 development/NET_SSLeay.pm +0 development/Net-DBus +0 development/Crypt-SmbHash +0 development/GnuPG +#Configuriert Interactive - not good! +#0 development/perl-ldap +0 network/yafc +0 network/quagga +0 network/aria2 +0 network/ircii -0 tools/tcpdump -0 tools/vtun -0 tools/nagios-plugins -0 tools/irssi -0 tools/yafc -0 tools/quagga -0 tools/aria2 -0 tools/ircii 0 tools/rpm 0 tools/clamcour 0 tools/rsync @@ -44,8 +57,6 @@ 0 tools/cvs 0 tools/ruby 0 tools/ruby-utils -0 tools/NET_SSLeay.pm -0 tools/Net-DBus 0 tools/bluez-utils 0 tools/dump 0 tools/lha @@ -70,3 +81,4 @@ #0 tools/pidgin-otr #Benötigt PostgreSQL #0 tools/dspam +#0 tools/nagios-plugins diff --git a/SysBuild/tools/Authen-SASL b/SysBuild/development/Authen-SASL similarity index 90% rename from SysBuild/tools/Authen-SASL rename to SysBuild/development/Authen-SASL index 9852e2f..911dd78 100644 --- a/SysBuild/tools/Authen-SASL +++ b/SysBuild/development/Authen-SASL @@ -69,15 +69,14 @@ # # -SRCPATH=Tools/Development - - +SRCPATH=/Development/Modules premk() { echo "Nothing to do for premk()" } -mk() { +mk32() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL prefix=$TMPROOT/usr make -j $NUMCPU @@ -87,6 +86,21 @@ mk() { mkdir -p $INSTLIB touch $INSTLIB/perllocal.pod + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 +} + +mk() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'` + mkdir -p $INSTLIB + touch $INSTLIB/perllocal.pod # Make install Optionen eintragen make -j $NUMCPU install diff --git a/SysBuild/tools/Convert-ASN1 b/SysBuild/development/Convert-ASN1 similarity index 90% rename from SysBuild/tools/Convert-ASN1 rename to SysBuild/development/Convert-ASN1 index 9852e2f..a7e30fb 100644 --- a/SysBuild/tools/Convert-ASN1 +++ b/SysBuild/development/Convert-ASN1 @@ -69,15 +69,14 @@ # # -SRCPATH=Tools/Development - - +SRCPATH=Development/Modules premk() { echo "Nothing to do for premk()" } -mk() { +mk32() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL prefix=$TMPROOT/usr make -j $NUMCPU @@ -87,6 +86,21 @@ mk() { mkdir -p $INSTLIB touch $INSTLIB/perllocal.pod + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 +} + +mk() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'` + mkdir -p $INSTLIB + touch $INSTLIB/perllocal.pod # Make install Optionen eintragen make -j $NUMCPU install @@ -94,8 +108,5 @@ mk() { } postmk() { -# cd $INSTLIB -# sed -e "s%$TMPROOT%%" perllocal.pod >/tmp/perllocal.pod -# mv /tmp/perllocal.pod perllocal.pod echo "Nothing to do for postmk()" } diff --git a/SysBuild/tools/Crypt-SmbHash b/SysBuild/development/Crypt-SmbHash similarity index 90% rename from SysBuild/tools/Crypt-SmbHash rename to SysBuild/development/Crypt-SmbHash index 9852e2f..1e62480 100644 --- a/SysBuild/tools/Crypt-SmbHash +++ b/SysBuild/development/Crypt-SmbHash @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Development +SRCPATH=Development/Modules @@ -77,7 +77,8 @@ premk() { echo "Nothing to do for premk()" } -mk() { +mk32() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL prefix=$TMPROOT/usr make -j $NUMCPU @@ -87,6 +88,21 @@ mk() { mkdir -p $INSTLIB touch $INSTLIB/perllocal.pod + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 +} + +mk() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'` + mkdir -p $INSTLIB + touch $INSTLIB/perllocal.pod # Make install Optionen eintragen make -j $NUMCPU install diff --git a/SysBuild/tools/Digest-HMAC b/SysBuild/development/Digest-HMAC similarity index 90% rename from SysBuild/tools/Digest-HMAC rename to SysBuild/development/Digest-HMAC index ae5b0aa..007e271 100644 --- a/SysBuild/tools/Digest-HMAC +++ b/SysBuild/development/Digest-HMAC @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Development +SRCPATH=Development/Modules @@ -77,7 +77,8 @@ premk() { echo "Nothing to do for premk()" } -mk() { +mk32() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL prefix=$TMPROOT/usr make -j $NUMCPU @@ -87,6 +88,21 @@ mk() { mkdir -p $INSTLIB touch $INSTLIB/perllocal.pod + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 +} + +mk() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'` + mkdir -p $INSTLIB + touch $INSTLIB/perllocal.pod # Make install Optionen eintragen make -j $NUMCPU install diff --git a/SysBuild/development/Digest-MD5 b/SysBuild/development/Digest-MD5 index c4bf8bf..4f436b9 100644 --- a/SysBuild/development/Digest-MD5 +++ b/SysBuild/development/Digest-MD5 @@ -79,6 +79,20 @@ premk() { CheckError "premk() failed !" 1 } +mk32() { + # Make-Optionen eintragen + export USE_ARCH=32 + perl Makefile.PL prefix=/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + # Make install Optionen eintragen + make -j $NUMCPU DESTDIR=$TMPROOT install + CheckError "Make install process failed !" 1 + unset USE_ARCH + make distclean +} + mk() { # Make-Optionen eintragen perl Makefile.PL prefix=/usr diff --git a/SysBuild/development/Digest-SHA1 b/SysBuild/development/Digest-SHA1 index 695549e..1ec3652 100644 --- a/SysBuild/development/Digest-SHA1 +++ b/SysBuild/development/Digest-SHA1 @@ -77,6 +77,24 @@ premk() { echo "Nothing to do for premk()" } +mk32() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'` + mkdir -p $INSTLIB + touch $INSTLIB/perllocal.pod + + + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 + unset USE_ARCH +} + mk() { # Make-Optionen eintragen perl Makefile.PL prefix=$TMPROOT/usr diff --git a/SysBuild/tools/ExtUtils-F77 b/SysBuild/development/ExtUtils-F77 similarity index 91% rename from SysBuild/tools/ExtUtils-F77 rename to SysBuild/development/ExtUtils-F77 index 9bccd53..dd95449 100644 --- a/SysBuild/tools/ExtUtils-F77 +++ b/SysBuild/development/ExtUtils-F77 @@ -68,22 +68,32 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Development +SRCPATH=/Development/Modules #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= premk() { - PERLVERSION=`perl --version|grep " v"|sed -e "s/.*v//"|awk '{print $1}'` - mkdir -p $TMPROOT/usr/lib/site_perl/$PERLVERSION/Alien/Package - return 0 + echo "Nothing to do for premk()" +} + +mk32() { + export USE_ARCH=$UARCH + perl Makefile.PL PREFIX=$TMPROOT/usr + CheckError "Configurescript failed !" 1 + + # Make-Optionen eintragen + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 } mk() { - # Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen. - # Den \ nicht vergessen ! - #perl Makefile.PL PREFIX=$TMPROOT + export USE_ARCH=$UARCH perl Makefile.PL PREFIX=$TMPROOT/usr CheckError "Configurescript failed !" 1 diff --git a/SysBuild/tools/GnuPG b/SysBuild/development/GnuPG similarity index 94% rename from SysBuild/tools/GnuPG rename to SysBuild/development/GnuPG index b45c639..4442332 100644 --- a/SysBuild/tools/GnuPG +++ b/SysBuild/development/GnuPG @@ -68,7 +68,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Development +SRCPATH=Development/Modules #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -78,7 +78,16 @@ premk() { echo "Nothing to do for premk()" } +mk32() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL PREFIX=$TMPROOT/usr && + make -j $NUMCPU && + make -j $NUMCPU PREFIX=$TMPROOT/usr install +} + mk() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL PREFIX=$TMPROOT/usr && make -j $NUMCPU && diff --git a/SysBuild/tools/IO-Socket-SSL b/SysBuild/development/IO-Socket-SSL similarity index 90% rename from SysBuild/tools/IO-Socket-SSL rename to SysBuild/development/IO-Socket-SSL index 50e29ec..d23e831 100644 --- a/SysBuild/tools/IO-Socket-SSL +++ b/SysBuild/development/IO-Socket-SSL @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Development +SRCPATH=Development/Modules @@ -77,7 +77,8 @@ premk() { echo "Nothing to do for premk()" } -mk() { +mk32() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL prefix=$TMPROOT/usr make -j $NUMCPU @@ -87,6 +88,21 @@ mk() { mkdir -p $INSTLIB touch $INSTLIB/perllocal.pod + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 +} + +mk() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'` + mkdir -p $INSTLIB + touch $INSTLIB/perllocal.pod # Make install Optionen eintragen make -j $NUMCPU install @@ -94,8 +110,5 @@ mk() { } postmk() { -# cd $INSTLIB -# sed -e "s%$TMPROOT%%" perllocal.pod >/tmp/perllocal.pod -# mv /tmp/perllocal.pod perllocal.pod echo "Nothing to do for postmk()" } diff --git a/SysBuild/tools/Net-DBus b/SysBuild/development/Net-DBus similarity index 92% rename from SysBuild/tools/Net-DBus rename to SysBuild/development/Net-DBus index 5eac088..a1d861c 100644 --- a/SysBuild/tools/Net-DBus +++ b/SysBuild/development/Net-DBus @@ -68,7 +68,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Development +SRCPATH=Development/Modules #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -79,7 +79,20 @@ premk() { CheckError "premk() failed !" 1 } +mk32() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + # Make install Optionen eintragen + make -j $NUMCPU DESTDIR=$TMPROOT install + CheckError "Make install process failed !" 1 +} + mk() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL prefix=/usr make -j $NUMCPU diff --git a/SysBuild/tools/Net-SSLeay.pm b/SysBuild/development/Net-SSLeay similarity index 88% rename from SysBuild/tools/Net-SSLeay.pm rename to SysBuild/development/Net-SSLeay index 05369e6..481654f 100644 --- a/SysBuild/tools/Net-SSLeay.pm +++ b/SysBuild/development/Net-SSLeay @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Development +SRCPATH=Development/Modules @@ -77,9 +77,10 @@ premk() { echo "Nothing to do for premk()" } -mk() { +mk32() { + export USE_ARCH=$UARCH # Make-Optionen eintragen - perl Makefile.PL /usr -- PREFIX=$TMPROOT/usr + yes ""|perl Makefile.PL /usr -- PREFIX=$TMPROOT/usr make -j $NUMCPU CheckError "Makeprocess failed !" 1 @@ -87,6 +88,21 @@ mk() { mkdir -p $INSTLIB touch $INSTLIB/perllocal.pod + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 +} + +mk() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + yes ""|perl Makefile.PL /usr -- PREFIX=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'` + mkdir -p $INSTLIB + touch $INSTLIB/perllocal.pod # Make install Optionen eintragen make -j $NUMCPU install @@ -94,8 +110,5 @@ mk() { } postmk() { -# cd $INSTLIB -# sed -e "s%$TMPROOT%%" perllocal.pod >/tmp/perllocal.pod -# mv /tmp/perllocal.pod perllocal.pod echo "Nothing to do for postmk()" } diff --git a/SysBuild/development/Sys-Syslog b/SysBuild/development/Sys-Syslog index e6298ee..036f836 100644 --- a/SysBuild/development/Sys-Syslog +++ b/SysBuild/development/Sys-Syslog @@ -75,6 +75,20 @@ premk() { echo "Nothing to do for premk()" } +mk32() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + echo -n "\n\n\n\n\n\n\n" | perl Makefile.PL prefix=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 + make distclean + unset USE_ARCH +} + mk() { # Make-Optionen eintragen echo -n "\n\n\n\n\n\n\n" | perl Makefile.PL prefix=$TMPROOT/usr diff --git a/SysBuild/tools/URI b/SysBuild/development/URI similarity index 90% rename from SysBuild/tools/URI rename to SysBuild/development/URI index 9852e2f..9c46186 100644 --- a/SysBuild/tools/URI +++ b/SysBuild/development/URI @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Development +SRCPATH=/Development/Modules @@ -77,7 +77,8 @@ premk() { echo "Nothing to do for premk()" } -mk() { +mk32() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL prefix=$TMPROOT/usr make -j $NUMCPU @@ -87,6 +88,21 @@ mk() { mkdir -p $INSTLIB touch $INSTLIB/perllocal.pod + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 +} + +mk() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'` + mkdir -p $INSTLIB + touch $INSTLIB/perllocal.pod # Make install Optionen eintragen make -j $NUMCPU install diff --git a/SysBuild/tools/XML-SAX-Base b/SysBuild/development/XML-SAX-Base similarity index 90% rename from SysBuild/tools/XML-SAX-Base rename to SysBuild/development/XML-SAX-Base index 9852e2f..ef643ac 100644 --- a/SysBuild/tools/XML-SAX-Base +++ b/SysBuild/development/XML-SAX-Base @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Development +SRCPATH=/Development/Modules @@ -77,7 +77,25 @@ premk() { echo "Nothing to do for premk()" } +mk32() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'` + mkdir -p $INSTLIB + touch $INSTLIB/perllocal.pod + + + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 +} + mk() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL prefix=$TMPROOT/usr make -j $NUMCPU diff --git a/SysBuild/tools/XML-Simple b/SysBuild/development/XML-Simple similarity index 92% rename from SysBuild/tools/XML-Simple rename to SysBuild/development/XML-Simple index 34fbb7d..c715981 100644 --- a/SysBuild/tools/XML-Simple +++ b/SysBuild/development/XML-Simple @@ -65,7 +65,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Development +SRCPATH=/Development/Modules #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -75,7 +75,20 @@ premk() { echo "Nothing to do for premk()" } +mk32() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + # Make install Optionen eintragen + make -j $NUMCPU DESTDIR=$TMPROOT install + CheckError "Make install process failed !" 1 +} + mk() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL prefix=/usr make -j $NUMCPU diff --git a/SysBuild/tools/perl-ldap b/SysBuild/development/perl-ldap similarity index 90% rename from SysBuild/tools/perl-ldap rename to SysBuild/development/perl-ldap index 50e29ec..9d5053e 100644 --- a/SysBuild/tools/perl-ldap +++ b/SysBuild/development/perl-ldap @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Development +SRCPATH=Development/Modules @@ -77,7 +77,8 @@ premk() { echo "Nothing to do for premk()" } -mk() { +mk32() { + export USE_ARCH=$UARCH # Make-Optionen eintragen perl Makefile.PL prefix=$TMPROOT/usr make -j $NUMCPU @@ -87,6 +88,21 @@ mk() { mkdir -p $INSTLIB touch $INSTLIB/perllocal.pod + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 +} + +mk() { + export USE_ARCH=$UARCH + # Make-Optionen eintragen + perl Makefile.PL prefix=$TMPROOT/usr + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + INSTLIB=`egrep "^INSTALLARCHLIB" Makefile | awk '{ print $3; };'` + mkdir -p $INSTLIB + touch $INSTLIB/perllocal.pod # Make install Optionen eintragen make -j $NUMCPU install diff --git a/SysBuild/tools/aria2c b/SysBuild/network/aria2c similarity index 98% rename from SysBuild/tools/aria2c rename to SysBuild/network/aria2c index 3f9dee4..0ab2855 100644 --- a/SysBuild/tools/aria2c +++ b/SysBuild/network/aria2c @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Clients premk() { echo "Nothing to do for premk()" @@ -78,8 +78,7 @@ premk() { mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --target=$TARGET \ - --sysconfdir=/etc \ + ./configure --sysconfdir=/etc \ --docdir=/usr/share/doc/atria2 \ --prefix=/usr make -j $NUMCPU diff --git a/SysBuild/tools/htdig b/SysBuild/network/htdig similarity index 97% rename from SysBuild/tools/htdig rename to SysBuild/network/htdig index 4052e99..47a92da 100644 --- a/SysBuild/tools/htdig +++ b/SysBuild/network/htdig @@ -70,11 +70,11 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Clients premk() { - sed -e "s%^CC =.*$%CC = /opt/gcc-3/bin/gcc%" htsearch/Makefile.in |\ - sed -e "s%^CXX =.*$%CXX = /opt/gcc-3/bin/g++%" |\ + sed -e "s%^CC =.*$%CC = gcc%" htsearch/Makefile.in |\ + sed -e "s%^CXX =.*$%CXX = g++%" |\ sed -e "s%^LIBTOOL = @LIBTOOL@%LIBTOOL = @LIBTOOL@ --tag bla%" >/tmp/Makefile.in mv /tmp/Makefile.in htsearch/Makefile.in } diff --git a/SysBuild/tools/ircii b/SysBuild/network/ircii similarity index 97% rename from SysBuild/tools/ircii rename to SysBuild/network/ircii index d2a1619..cf817d3 100644 --- a/SysBuild/tools/ircii +++ b/SysBuild/network/ircii @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Clients premk() { echo "Nothing to do for premk()" @@ -81,8 +81,7 @@ mk() { ./configure --host=$BUILDSYS \ --with-emacs-meta-keys \ --prefix=/usr - mv Makefile Makefile.nearly - sed -e "s/^LIBS = /LIBS = -liconv /g" Makefile.nearly > Makefile + sed -i -e "s/^LIBS = /LIBS = -liconv /g" Makefile make -j $NUMCPU make -k -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/SysBuild/tools/irssi b/SysBuild/network/irssi similarity index 97% rename from SysBuild/tools/irssi rename to SysBuild/network/irssi index 403199c..172bc93 100644 --- a/SysBuild/tools/irssi +++ b/SysBuild/network/irssi @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Clients premk() { echo "Nothing to do for premk()" @@ -78,6 +78,8 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ + LDEMULATION=elf_i386 \ ./configure --target=$TARGET32 \ --with-socks \ --with-textui \ @@ -87,7 +89,7 @@ mk32() { --with-gc \ --sysconfdir=/etc \ --prefix=/usr - make -j $NUMCPU + make -j $NUMCPU LDEMULATION=elf_i386 make -j $NUMCPU DESTDIR=$TMPROOT install make distclean } @@ -98,6 +100,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --with-socks \ --with-textui \ diff --git a/SysBuild/tools/mutt b/SysBuild/network/mutt similarity index 97% rename from SysBuild/tools/mutt rename to SysBuild/network/mutt index db2a454..62790c5 100644 --- a/SysBuild/tools/mutt +++ b/SysBuild/network/mutt @@ -60,7 +60,8 @@ #Module zur Erstellung des Packetes: #Quelle der Source Archive: http://www.mutt.org -#Kurzbeschreibung: Kommandozeilen Mailclient f. Maildir, Mailfile, POP3, IMAP +#Kurzbeschreibung: +#Kommandozeilen Mailclient f. Maildir, Mailfile, POP3, IMAP # # #Letzte Änderung von: $Author$ @@ -69,7 +70,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Clients premk() { echo "Nothing to do for premk()" diff --git a/SysBuild/tools/openvpn b/SysBuild/network/openvpn similarity index 99% rename from SysBuild/tools/openvpn rename to SysBuild/network/openvpn index 2cd24c3..cf3c054 100644 --- a/SysBuild/tools/openvpn +++ b/SysBuild/network/openvpn @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Servers premk() { echo "Nothing to do for premk()" diff --git a/SysBuild/tools/pam_ldap b/SysBuild/network/pam_ldap similarity index 93% rename from SysBuild/tools/pam_ldap rename to SysBuild/network/pam_ldap index 2d717a8..598de53 100644 --- a/SysBuild/tools/pam_ldap +++ b/SysBuild/network/pam_ldap @@ -70,16 +70,27 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Clients premk() { echo "Nothing to do for premk()" } +mk32() { + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ + ./configure --target=$TARGET32 + + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install + make distclean +} + mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --target=$TARGET + ./configure --target=$TARGET \ + --libdir=/$LIBDIR make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/tools/quagga b/SysBuild/network/quagga similarity index 88% rename from SysBuild/tools/quagga rename to SysBuild/network/quagga index 69a9fba..d731321 100644 --- a/SysBuild/tools/quagga +++ b/SysBuild/network/quagga @@ -69,16 +69,17 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Servers premk() { echo "Nothing to do for premk()" } -mk() { - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ - ./configure --target=$TARGET \ +mk32() { + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ + ./configure --target=$TARGET32 \ + --libdir=/usr/lib \ --enable-vtysh \ --enable-snmp \ --enable-tcp-zebra \ @@ -87,6 +88,28 @@ mk() { --enable-ospf-te \ --enable-tcp-signature \ --enable-irdp \ + --disable-ipv6 \ + --sysconfdir=/etc/quagga \ + --prefix=/usr + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install + make distclean +} + +mk() { + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + ./configure --target=$TARGET \ + --libdir=/usr/$LIBDIR \ + --enable-vtysh \ + --enable-snmp \ + --enable-tcp-zebra \ + --enable-nssa \ + --enable-opaque-lsa \ + --enable-ospf-te \ + --enable-tcp-signature \ + --enable-irdp \ + --disable-ipv6 \ --sysconfdir=/etc/quagga \ --prefix=/usr make -j $NUMCPU diff --git a/SysBuild/tools/rsync b/SysBuild/network/rsync similarity index 99% rename from SysBuild/tools/rsync rename to SysBuild/network/rsync index 3a18958..b3fd4d9 100644 --- a/SysBuild/tools/rsync +++ b/SysBuild/network/rsync @@ -69,7 +69,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Net +SRCPATH=Network/Servers #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= diff --git a/SysBuild/tools/sendmail b/SysBuild/network/sendmail similarity index 99% rename from SysBuild/tools/sendmail rename to SysBuild/network/sendmail index c76468c..eacaac9 100644 --- a/SysBuild/tools/sendmail +++ b/SysBuild/network/sendmail @@ -73,7 +73,7 @@ # #Pfad zu Basis Source Tree eintragen! -SRCPATH=Tools/Net +SRCPATH=Network/Servers #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen #ausgeführt (sprich unpack src; cd src; premk) diff --git a/SysBuild/tools/tcpdump b/SysBuild/network/tcpdump similarity index 98% rename from SysBuild/tools/tcpdump rename to SysBuild/network/tcpdump index acfbb2c..62931a8 100644 --- a/SysBuild/tools/tcpdump +++ b/SysBuild/network/tcpdump @@ -69,7 +69,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Net +SRCPATH=Network/Monitor #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -83,7 +83,8 @@ mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ ./configure --target=$TARGET \ - --prefix=/usr && + --prefix=/usr \ + --disable-ipv6 && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 diff --git a/SysBuild/tools/vtun b/SysBuild/network/vtun similarity index 93% rename from SysBuild/tools/vtun rename to SysBuild/network/vtun index 6fca124..c9cbff7 100644 --- a/SysBuild/tools/vtun +++ b/SysBuild/network/vtun @@ -71,7 +71,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Net +SRCPATH=Network/Servers #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -89,13 +89,9 @@ mk() { --disable-lzo \ --sysconfdir=/etc/sysconfig/vtun \ --localstatedir=/var \ - --mandir=/usr/share/man - make -j $NUMCPU - make -j $NUMCPU prefix=$TMPROOT/usr \ - ETC_DIR=$TMPROOT/etc/sysconfig/vtun \ - VAR_DIR=$TMPROOT/var \ - MAN_DIR=$TMPROOT/usr/share/man install - CheckError "Make install process failed !" 1 + --mandir=/usr/share/man && + make -j $NUMCPU && + make -j $NUMCPU DESTDIR=$TMPROOT install } postmk() { diff --git a/SysBuild/tools/yafc b/SysBuild/network/yafc similarity index 98% rename from SysBuild/tools/yafc rename to SysBuild/network/yafc index 2f47107..177c52e 100644 --- a/SysBuild/tools/yafc +++ b/SysBuild/network/yafc @@ -68,7 +68,7 @@ # #Pfad zu Basis Source Tree eintragen! -SRCPATH=Tools/Net +SRCPATH=Network/Clients #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen #ausgeführt (sprich unpack src; cd src; premk) @@ -84,8 +84,8 @@ mk() { CXX="g++ $BUILDOPTIONS" \ ./configure --host=$TARGET \ --prefix=/usr \ - --without-krb5 \ - --without-gssapi && + --without-gssapi \ + --without-krb5 && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/SysBuild/tools/nss b/SysBuild/security/nss similarity index 99% rename from SysBuild/tools/nss rename to SysBuild/security/nss index 3cb870c..b8b86f0 100644 --- a/SysBuild/tools/nss +++ b/SysBuild/security/nss @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/lib +SRCPATH=Security/Lib premk() { mkdir -p $TMPROOT/opt/mozilla/nss diff --git a/SysBuild/tools/nrpe b/SysBuild/tools/nrpe index ffaf676..64d8fca 100644 --- a/SysBuild/tools/nrpe +++ b/SysBuild/tools/nrpe @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Tools/Utilities premk() { if ! getent group nagios ; then diff --git a/SysBuild/tools/rpm b/SysBuild/tools/rpm index 8134748..2aff920 100644 --- a/SysBuild/tools/rpm +++ b/SysBuild/tools/rpm @@ -84,6 +84,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr \ --with-gnu-ld \ @@ -100,6 +101,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/usr \ $ADDOPTIONS \