Geändert:

  * Zaptel gefixt.
Hinzugefügt:
  * Portmap-Paket

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@246 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/lfs/portmap b/lfs/portmap
index 8f464b5a221c95598622af0a41b726527a508b16..3c224a35120d6e0bd1134c9502339433be97e8b8 100644 (file)
--- a/lfs/portmap
+++ b/lfs/portmap
@@ -33,6 +33,8 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = ftp://ftp.porcupine.org/pub/security
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = portmap
+PAK_VER    = ipfire-beta1
 
 ###############################################################################
 # Top-level Rules
@@ -53,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-       make-packages.sh portmap $(THISAPP)-ipfire-beta-1
+       @$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum

diff --git a/lfs/zaptel b/lfs/zaptel
index 0896a4121c63c3aaca4ab168d66dfa9e02a13dc1..67813370ff329b57b9dc1b1c891f477fce490268 100644 (file)
--- a/lfs/zaptel
+++ b/lfs/zaptel
@@ -93,6 +93,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && install -D -m 644 kb1ec_const.h /usr/include/linux/kb1ec_const.h
        cd $(DIR_APP) && install -D -m 644 biquad.h /usr/include/linux/biquad.h
        cd $(DIR_APP) && install -D -m 644 arith.h /usr/include/linux/arith.h
+       cd $(DIR_APP) && install -D -m 644 mg2ec.h /usr/include/linux/mg2ec.h
+       cd $(DIR_APP) && install -D -m 644 mg2ec_const.h /usr/include/linux/mg2ec_const.h
        ln -nf -v /usr/include/linux/zaptel.h /usr/include/zaptel.h
        ln -nf -v /usr/include/linux/zconfig.h /usr/include/zconfig.h
        ln -nf -v /usr/include/linux/ecdis.h /usr/include/ecdis.h
@@ -101,6 +103,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -nf -v /usr/include/linux/kb1ec_const.h /usr/include/kb1ec_const.h
        ln -nf -v /usr/include/linux/biquad.h /usr/include/biquad.h
        ln -nf -v /usr/include/linux/arith.h /usr/include/arith.h
+       ln -nf -v /usr/include/linux/mg2ec.h /usr/include/mg2ec.h
+       ln -nf -v /usr/include/linux/mg2ec_const.h /usr/include/mg2ec_const.h
        find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
        find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index f167935c784e2615852bfb62b45c85883f0cd85a..3f463b5c443b26027848820aa4f6471448ae9925 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -888,6 +888,7 @@ ipfirepackages() {
   ipfiredist nfs
   ipfiredist nmap
   ipfiredist ntop
+  ipfiredist portmap
   ipfiredist postfix
   ipfiredist procmail
   ipfiredist samba
@@ -1506,31 +1507,34 @@ unattended)
        ### This is our procedure that will compile the IPFire by herself...
        echo "### UPDATE LOGS"
        update_logs
-       echo "### SAVING TIME"
-       export IPFIRE_START_TIME=`date`
 
-       echo "### GETTING TOOLCHAIN"
-       $0 gettoolchain
+       if [ "$IPFIRE_REBUILD" -eq "0" ]; then
+               echo "### SAVING TIME"
+               export IPFIRE_START_TIME=`date`
 
-       echo "### RUNNING SVN-UPDATE"
-       $0 svn update
-       if [ $? -ne 0 ]; then
-               $0 mail SVNUPDATE
-               exit 1
-       fi
+               echo "### GETTING TOOLCHAIN"
+               $0 gettoolchain
+
+               echo "### RUNNING SVN-UPDATE"
+               $0 svn update
+               if [ $? -ne 0 ]; then
+                       $0 mail SVNUPDATE
+                       exit 1
+               fi
        
-       echo "### EXPORT SOURCES"
-       $0 svn dist
-       if [ $? -ne 0 ]; then
-               $0 mail SVNDIST
-               exit 1
-       fi
+               echo "### EXPORT SOURCES"
+               $0 svn dist
+               if [ $? -ne 0 ]; then
+                       $0 mail SVNDIST
+                       exit 1
+               fi
 
-       echo "### RUNNING PREFETCH"
-       $0 prefetch | grep -q "md5 difference"
-       if [ $? -eq 0 ]; then
-               $0 mail PREFETCH
-               exit 1
+               echo "### RUNNING PREFETCH"
+               $0 prefetch | grep -q "md5 difference"
+               if [ $? -eq 0 ]; then
+                       $0 mail PREFETCH
+                       exit 1
+               fi
        fi
 
        echo "### RUNNING BUILD"
@@ -1562,10 +1566,16 @@ unattended)
        exit 0
        ;;
 batch)
-       if [ `screen -ls | grep batch` ]; then
+       if [ `screen -ls | grep -q ipfire` ]; then
                echo "Build is already running, sorry!"
                exit 1
        else
+               if [ "$2" = "--rebuild" ]; then
+                       export IPFIRE_REBUILD=1
+                       echo "REBUILD!"
+               else
+                       export IPFIRE_REBUILD=0
+               fi
                echo -n "IPFire-Batch-Build is starting..."
                screen -dmS ipfire $0 unattended
                if [ "$?" -eq "0" ]; then
@@ -1574,11 +1584,6 @@ batch)
                        echo ".ERROR!"
                        exit 1
                fi
-               #if [ "$2" -eq "-v" ]; then
-               #       screen -x ipfire
-               #else
-               #       echo "You may attach you with '-v'."
-               #fi
                exit 0
        fi
        ;;

diff --git a/src/paks/portmap/ROOTFILES b/src/paks/portmap/ROOTFILES
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d3bdae8e7c1c26c06d57ba143e88e801fda18501 100644 (file)
--- a/src/paks/portmap/ROOTFILES
+++ b/src/paks/portmap/ROOTFILES
@@ -0,0 +1,6 @@
+sbin/portmap
+usr/sbin/pmap_dump
+usr/sbin/pmap_set
+#usr/share/man/man8/pmap_dump.8
+#usr/share/man/man8/pmap_set.8
+#usr/share/man/man8/portmap.8