core81: set need reboot flag and restart apache.

[people/teissler/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index a9bcdc477b43658a2fa4f44b33aa608831f0f3a4..bfb9365156af574b0c8e29ec18aa4f87c8cadc65 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.15"                                                 # Version number
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.15"                                                 # Version number

-CORE="78"                                                      # Core Level (Filename)
-PAKFIRE_CORE="78"                                              # Core Level (PAKFIRE)
+CORE="81"                                                      # Core Level (Filename)
+PAKFIRE_CORE="81"                                              # Core Level (PAKFIRE)

 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir


@@ -65,12 +65,16 @@ mkdir $BASEDIR/log/ 2>/dev/null
 # Include funtions
 . tools/make-functions
 
 # Include funtions
 . tools/make-functions
 

-configure_target "default"
-

 if [ -f .config ]; then
        . .config
 fi
 
 if [ -f .config ]; then
        . .config
 fi
 

+if [ -n "${TARGET_ARCH}" ]; then
+       configure_target "${TARGET_ARCH}"
+else
+       configure_target "default"
+fi
+

 if [ -z $EDITOR ]; then
        for i in nano emacs vi; do
                EDITOR=$(which $i 2>/dev/null)
 if [ -z $EDITOR ]; then
        for i in nano emacs vi; do
                EDITOR=$(which $i 2>/dev/null)


@@ -351,6 +355,7 @@ buildbase() {
     lfsmake2 groff
     lfsmake2 gperf
     lfsmake2 gzip
     lfsmake2 groff
     lfsmake2 gperf
     lfsmake2 gzip

+    lfsmake2 hostname

     lfsmake2 iproute2
     lfsmake2 jwhois
     lfsmake2 kbd
     lfsmake2 iproute2
     lfsmake2 jwhois
     lfsmake2 kbd


@@ -380,9 +385,6 @@ buildipfire() {
   export LOGFILE
   ipfiremake configroot
   ipfiremake backup
   export LOGFILE
   ipfiremake configroot
   ipfiremake backup

-  ipfiremake bind
-  ipfiremake dhcp
-  ipfiremake dhcpcd

   ipfiremake libusb
   ipfiremake libusbx
   ipfiremake libpcap
   ipfiremake libusb
   ipfiremake libusbx
   ipfiremake libpcap


@@ -454,14 +456,20 @@ buildipfire() {
                ;;
   esac
   ipfiremake pkg-config
                ;;
   esac
   ipfiremake pkg-config

+  ipfiremake openssl
+  ipfiremake openssl-compat
+  ipfiremake libgpg-error
+  ipfiremake libgcrypt
+  ipfiremake libassuan
+  ipfiremake bind
+  ipfiremake dhcp
+  ipfiremake dhcpcd

   ipfiremake linux-atm
   ipfiremake cpio
   ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake pam
   ipfiremake linux-atm
   ipfiremake cpio
   ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake pam

-  ipfiremake openssl
-  ipfiremake openssl-compat

   ipfiremake curl
   ipfiremake tcl
   ipfiremake sqlite
   ipfiremake curl
   ipfiremake tcl
   ipfiremake sqlite


@@ -500,6 +508,7 @@ buildipfire() {
   ipfiremake arping
   ipfiremake beep
   ipfiremake dvdrtools
   ipfiremake arping
   ipfiremake beep
   ipfiremake dvdrtools

+  ipfiremake nettle

   ipfiremake dnsmasq
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
   ipfiremake dnsmasq
   ipfiremake dosfstools
   ipfiremake reiserfsprogs


@@ -668,8 +677,10 @@ buildipfire() {
   ipfiremake netpbm
   ipfiremake phpSANE
   ipfiremake tunctl
   ipfiremake netpbm
   ipfiremake phpSANE
   ipfiremake tunctl

+  ipfiremake netsnmpd

   ipfiremake nagios
   ipfiremake nagios_nrpe
   ipfiremake nagios
   ipfiremake nagios_nrpe

+  ipfiremake icinga

   ipfiremake ebtables
   ipfiremake directfb
   ipfiremake dfb++
   ipfiremake ebtables
   ipfiremake directfb
   ipfiremake dfb++


@@ -677,6 +688,7 @@ buildipfire() {
   ipfiremake ffmpeg
   ipfiremake vdr
   ipfiremake vdr_streamdev
   ipfiremake ffmpeg
   ipfiremake vdr
   ipfiremake vdr_streamdev

+  ipfiremake vdr_vnsiserver5

   ipfiremake vdr_vnsiserver3
   ipfiremake vdr_epgsearch
   ipfiremake vdr_dvbapi
   ipfiremake vdr_vnsiserver3
   ipfiremake vdr_epgsearch
   ipfiremake vdr_dvbapi


@@ -714,13 +726,11 @@ buildipfire() {
   ipfiremake perl-Sort-Naturally
   ipfiremake vdradmin
   ipfiremake miau
   ipfiremake perl-Sort-Naturally
   ipfiremake vdradmin
   ipfiremake miau

-  ipfiremake netsnmpd

   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
   ipfiremake perl-DBD-SQLite
   ipfiremake perl-File-ReadBackwards
   ipfiremake cacti
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
   ipfiremake perl-DBD-SQLite
   ipfiremake perl-File-ReadBackwards
   ipfiremake cacti

-  ipfiremake icecc

   ipfiremake openvmtools
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake openvmtools
   ipfiremake nagiosql
   ipfiremake iftop


@@ -753,6 +763,7 @@ buildipfire() {
   ipfiremake python-progressbar
   ipfiremake python-xattr
   ipfiremake intltool
   ipfiremake python-progressbar
   ipfiremake python-xattr
   ipfiremake intltool

+  ipfiremake ddns

   ipfiremake transmission
   ipfiremake dpfhack
   ipfiremake lcd4linux
   ipfiremake transmission
   ipfiremake dpfhack
   ipfiremake lcd4linux


@@ -763,8 +774,6 @@ buildipfire() {
   ipfiremake fping
   ipfiremake telnet
   ipfiremake xinetd
   ipfiremake fping
   ipfiremake telnet
   ipfiremake xinetd

-  ipfiremake libgpg-error
-  ipfiremake libassuan

   ipfiremake gpgme
   ipfiremake pygpgme
   ipfiremake pakfire3
   ipfiremake gpgme
   ipfiremake pygpgme
   ipfiremake pakfire3


@@ -797,6 +806,7 @@ buildipfire() {
   ipfiremake iotop
   ipfiremake stunnel
   ipfiremake sslscan
   ipfiremake iotop
   ipfiremake stunnel
   ipfiremake sslscan

+  ipfiremake owncloud

 }
 
 buildinstaller() {
 }
 
 buildinstaller() {