]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - make.sh
projects / people / teissler / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'ccache-update' into glibc-update2
[people/teissler/ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index 9e34c03cca677414452c344a2206165b6a7a2109..19edce62e37b6ea008f44c42e51f28b421d4adf7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.11"                                                 # Version number
-CORE="59"                                                      # Core Level (Filename)
-PAKFIRE_CORE="59"                                              # Core Level (PAKFIRE)
+CORE="62"                                                      # Core Level (Filename)
+PAKFIRE_CORE="61"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -222,7 +222,7 @@ prepareenv() {
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
-    export CCACHE_HASHDIR=1
+    export CCACHE_COMPILERCHECK="none"
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
     rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
@@ -265,11 +265,7 @@ buildtoolchain() {
     lfsmake1 binutils  PASS=1
     lfsmake1 gcc               PASS=1
     export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
-    if [ "${MACHINE_TYPE}" = "arm" ]; then
-        lfsmake1 linux TOOLS=1 HEADERS=1
-    else
-        lfsmake1 linux-libc-header
-    fi
+    lfsmake1 linux2 TOOLS=1 HEADERS=1
     lfsmake1 glibc
     lfsmake1 cleanup-toolchain PASS=1
     lfsmake1 fake-environ
@@ -306,11 +302,7 @@ buildbase() {
     LOGFILE="$BASEDIR/log/_build.base.log"
     export LOGFILE
     lfsmake2 stage2
-    if [ "${MACHINE_TYPE}" = "arm" ]; then
-        lfsmake2 linux HEADERS=1
-    else
-        lfsmake2 linux-libc-header
-    fi
+    lfsmake2 linux2 HEADERS=1
     lfsmake2 man-pages
     lfsmake2 glibc
     lfsmake2 tzdata
@@ -384,93 +376,89 @@ buildipfire() {
   ipfiremake xz
   ipfiremake linux-firmware
   ipfiremake zd1211-firmware
+  ipfiremake rpi-firmware
   ipfiremake fw_ath9k_htc
   ipfiremake u-boot
 
   # The xen and PAE kernels are only available for x86
   if [ "${MACHINE_TYPE}" != "arm" ]; then
-    ipfiremake linux                   KCFG="-xen"
-    ipfiremake kqemu                   KCFG="-xen"
-    ipfiremake v4l-dvb                 KCFG="-xen"
-    ipfiremake madwifi                 KCFG="-xen"
-    ipfiremake mISDN                   KCFG="-xen"
-    ipfiremake dahdi                   KCFG="-xen" KMOD=1
+    ipfiremake linux2                  KCFG="-xen"
+#    ipfiremake v4l-dvb                        KCFG="-xen"
+#    ipfiremake mISDN                  KCFG="-xen"
+#    ipfiremake dahdi                  KCFG="-xen" KMOD=1
     ipfiremake cryptodev               KCFG="-xen"
     ipfiremake compat-wireless         KCFG="-xen"
-    ipfiremake r8169                   KCFG="-xen"
-    ipfiremake r8168                   KCFG="-xen"
-    ipfiremake r8101                   KCFG="-xen"
-    ipfiremake e1000                   KCFG="-xen"
-    ipfiremake e1000e                  KCFG="-xen"
-    ipfiremake igb                     KCFG="-xen"
+#    ipfiremake r8169                  KCFG="-xen"
+#    ipfiremake r8168                  KCFG="-xen"
+#    ipfiremake r8101                  KCFG="-xen"
+#    ipfiremake e1000                  KCFG="-xen"
+#    ipfiremake e1000e                 KCFG="-xen"
+#    ipfiremake igb                    KCFG="-xen"
+
     ipfiremake linux                   KCFG="-pae"
-    ipfiremake kqemu                   KCFG="-pae"
-    ipfiremake kvm-kmod                        KCFG="-pae"
-    ipfiremake v4l-dvb                 KCFG="-pae"
-    ipfiremake madwifi                 KCFG="-pae"
+#    ipfiremake kvm-kmod                       KCFG="-pae"
+#    ipfiremake v4l-dvb                        KCFG="-pae"
     ipfiremake alsa                    KCFG="-pae" KMOD=1
-    ipfiremake mISDN                   KCFG="-pae"
-    ipfiremake dahdi                   KCFG="-pae" KMOD=1
+#    ipfiremake mISDN                  KCFG="-pae"
+#    ipfiremake dahdi                  KCFG="-pae" KMOD=1
     ipfiremake cryptodev               KCFG="-pae"
     ipfiremake compat-wireless         KCFG="-pae"
 #    ipfiremake r8169                  KCFG="-pae"
 #    ipfiremake r8168                  KCFG="-pae"
 #    ipfiremake r8101                  KCFG="-pae"
-    ipfiremake e1000                   KCFG="-pae"
-    ipfiremake e1000e                  KCFG="-pae"
-    ipfiremake igb                     KCFG="-pae"
+#    ipfiremake e1000                  KCFG="-pae"
+#    ipfiremake e1000e                 KCFG="-pae"
+#    ipfiremake igb                    KCFG="-pae"
+
     ipfiremake linux                   KCFG=""
-    ipfiremake v4l-dvb                 KCFG=""
-    ipfiremake kqemu                   KCFG=""
-    ipfiremake kvm-kmod                        KCFG=""
-    ipfiremake madwifi                 KCFG=""
+#    ipfiremake kvm-kmod                       KCFG=""
+#    ipfiremake v4l-dvb                        KCFG=""
     ipfiremake alsa                    KCFG="" KMOD=1
-    ipfiremake mISDN                   KCFG=""
-    ipfiremake dahdi                   KCFG="" KMOD=1
+#    ipfiremake mISDN                  KCFG=""
+#    ipfiremake dahdi                  KCFG="" KMOD=1
     ipfiremake cryptodev               KCFG=""
     ipfiremake compat-wireless         KCFG=""
 #    ipfiremake r8169                  KCFG=""
 #    ipfiremake r8168                  KCFG=""
 #    ipfiremake r8101                  KCFG=""
-    ipfiremake e1000                   KCFG=""
-    ipfiremake e1000e                  KCFG=""
-    ipfiremake igb                     KCFG=""
+#    ipfiremake e1000                  KCFG=""
+#    ipfiremake e1000e                 KCFG=""
+#    ipfiremake igb                    KCFG=""
+
   else
     # arm-omap kernel build
-    ipfiremake linux3                  KCFG="-omap"
+    ipfiremake linux                   KCFG="-rpi"
+
+    ipfiremake linux                   KCFG="-omap"
 
     # arm-versatile kernel build
     ipfiremake linux                   KCFG="-versatile"
-    ipfiremake v4l-dvb                 KCFG="-versatile"
-    ipfiremake kqemu                   KCFG="-versatile"
-    ipfiremake kvm-kmod                        KCFG="-versatile"
-    ipfiremake madwifi                 KCFG="-versatile"
-    ipfiremake mISDN                   KCFG="-versatile"
-    ipfiremake dahdi                   KCFG="-versatile" KMOD=1
+#    ipfiremake v4l-dvb                        KCFG="-versatile"
+#    ipfiremake kvm-kmod                       KCFG="-versatile"
+#    ipfiremake mISDN                  KCFG="-versatile"
+#    ipfiremake dahdi                  KCFG="-versatile" KMOD=1
     ipfiremake cryptodev               KCFG="-versatile"
     ipfiremake compat-wireless         KCFG="-versatile"
-#  ipfiremake r8169                    KCFG="-versatile"
-#  ipfiremake r8168                    KCFG="-versatile"
-#  ipfiremake r8101                    KCFG="-versatile"
-    ipfiremake e1000                   KCFG="-versatile"
-    ipfiremake e1000e                  KCFG="-versatile"
-    ipfiremake igb                     KCFG="-versatile"
+#    ipfiremake r8169                  KCFG="-versatile"
+#    ipfiremake r8168                  KCFG="-versatile"
+#    ipfiremake r8101                  KCFG="-versatile"
+#    ipfiremake e1000                  KCFG="-versatile"
+#    ipfiremake e1000e                 KCFG="-versatile"
+#    ipfiremake igb                    KCFG="-versatile"
     # arm-kirkwood kernel build
     ipfiremake linux                   KCFG="-kirkwood"
-    ipfiremake v4l-dvb                 KCFG="-kirkwood"
-    ipfiremake kqemu                   KCFG="-kirkwood"
-    ipfiremake kvm-kmod                        KCFG="-kirkwood"
-    ipfiremake madwifi                 KCFG="-kirkwood"
-    ipfiremake mISDN                   KCFG="-kirkwood"
-    ipfiremake dahdi                   KCFG="-kirkwood" KMOD=1
+#    ipfiremake v4l-dvb                        KCFG="-kirkwood"
+#    ipfiremake kvm-kmod                       KCFG="-kirkwood"
+#    ipfiremake mISDN                  KCFG="-kirkwood"
+#    ipfiremake dahdi                  KCFG="-kirkwood" KMOD=1
     ipfiremake cryptodev               KCFG="-kirkwood"
     ipfiremake compat-wireless         KCFG="-kirkwood"
-#  ipfiremake r8169                    KCFG="-kirkwood"
-#  ipfiremake r8168                    KCFG="-kirkwood"
-#  ipfiremake r8101                    KCFG="-kirkwood"
-    ipfiremake e1000                   KCFG="-kirkwood"
-    ipfiremake e1000e                  KCFG="-kirkwood"
-    ipfiremake igb                     KCFG="-kirkwood"
+#    ipfiremake r8169                  KCFG="-kirkwood"
+#    ipfiremake r8168                  KCFG="-kirkwood"
+#    ipfiremake r8101                  KCFG="-kirkwood"
+#    ipfiremake e1000                  KCFG="-kirkwood"
+#    ipfiremake e1000e                 KCFG="-kirkwood"
+#    ipfiremake igb                    KCFG="-kirkwood"
   fi
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -620,7 +608,7 @@ buildipfire() {
   ipfiremake hddtemp
   ipfiremake smartmontools
   ipfiremake htop
-  ipfiremake postfix
+#  ipfiremake postfix               # unknown system type linux 3.2.x
   ipfiremake fetchmail
   ipfiremake cyrus-imapd
   ipfiremake openmailadmin
@@ -674,7 +662,6 @@ buildipfire() {
   ipfiremake fbset
   ipfiremake sdl
   ipfiremake qemu
-  ipfiremake qemu-kqemu
   ipfiremake sane
   ipfiremake netpbm
   ipfiremake phpSANE
@@ -738,9 +725,9 @@ buildipfire() {
   ipfiremake nut
   ipfiremake watchdog
   ipfiremake libpri
-  ipfiremake dahdi
-  ipfiremake asterisk
-  ipfiremake lcr
+#  ipfiremake dahdi               # update needed for 3.2.x
+#  ipfiremake asterisk
+#  ipfiremake lcr
   ipfiremake usb_modeswitch
   ipfiremake usb_modeswitch_data
   ipfiremake zerofree
@@ -750,7 +737,7 @@ buildipfire() {
   ipfiremake minicom
   ipfiremake ddrescue
   ipfiremake imspector
-  ipfiremake miniupnpd
+#  ipfiremake miniupnpd              # will not build
   ipfiremake client175
   ipfiremake powertop
   ipfiremake parted
@@ -768,6 +755,8 @@ buildipfire() {
   ipfiremake transmission
   ipfiremake dpfhack
   ipfiremake lcd4linux
+  ipfiremake mtr
+  ipfiremake tcpick
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
Timo's tree of IPFire 2.x