Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch-to...

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

diff --git a/make.sh b/make.sh
index 03eba4ac8310c335c5e89c4432160e00b1c7f224..d2ce7d4d3faebdcc666fd6e5f6f63b04fffd2213 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"                                                 # Version number
-CORE="144"                                                     # Core Level (Filename)
+CORE="145"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level
@@ -1084,6 +1084,7 @@ buildbase() {
        lfsmake2 autoconf
        lfsmake2 automake
        lfsmake2 berkeley
+       lfsmake2 berkeley-compat
        lfsmake2 coreutils
        lfsmake2 iana-etc
        lfsmake2 m4
@@ -1106,6 +1107,7 @@ buildbase() {
        lfsmake2 flex
        lfsmake2 gawk
        lfsmake2 gettext
+       lfsmake2 go
        lfsmake2 grep
        lfsmake2 groff
        lfsmake2 gperf
@@ -1253,6 +1255,8 @@ buildipfire() {
   lfsmake2 libnl-3
   lfsmake2 libidn
   lfsmake2 nasm
+  lfsmake2 libarchive
+  lfsmake2 cmake
   lfsmake2 libjpeg
   lfsmake2 libjpeg-compat
   lfsmake2 libexif
@@ -1281,8 +1285,6 @@ buildipfire() {
   lfsmake2 bootstrap
   lfsmake2 arping
   lfsmake2 beep
-  lfsmake2 libarchive
-  lfsmake2 cmake
   lfsmake2 libssh
   lfsmake2 cdrkit
   lfsmake2 dosfstools
@@ -1353,8 +1355,6 @@ buildipfire() {
   lfsmake2 python-daemon
   lfsmake2 python-ipaddress
   lfsmake2 glib
-  lfsmake2 GeoIP
-  lfsmake2 geoip-database
   lfsmake2 ntp
   lfsmake2 openssh
   lfsmake2 fontconfig
@@ -1406,6 +1406,7 @@ buildipfire() {
   lfsmake2 cifs-utils
   lfsmake2 krb5
   lfsmake2 samba
+  lfsmake2 netatalk
   lfsmake2 sudo
   lfsmake2 mc
   lfsmake2 wget
@@ -1521,6 +1522,7 @@ buildipfire() {
   lfsmake2 perl-DBD-SQLite
   lfsmake2 perl-File-ReadBackwards
   lfsmake2 openvmtools
+  lfsmake2 libmicrohttpd
   lfsmake2 motion
   lfsmake2 joe
   lfsmake2 monit
@@ -1639,10 +1641,10 @@ buildipfire() {
   lfsmake2 flashrom
   lfsmake2 firmware-update
   lfsmake2 tshark
-  lfsmake2 geoip-generator
   lfsmake2 speedtest-cli
   lfsmake2 rfkill
   lfsmake2 amazon-ssm-agent
+  lfsmake2 libloc
 }
 
 buildinstaller() {
@@ -1703,7 +1705,7 @@ buildpackages() {
   # remove not useable iso on armv5tel (needed to build flash images)
   [ "${BUILD_ARCH}" = "armv5tel" ] && rm -rf *.iso
 
-  for i in `ls *.bz2 *.img.xz *.iso`; do
+  for i in $(ls *.bz2 *.img.xz *.iso 2>/dev/null); do
        md5sum $i > $i.md5
   done
   cd $PWD
@@ -1989,8 +1991,13 @@ lang)
 update-contributors)
        update_contributors
        ;;
+find-dependencies)
+       shift
+       exec "${BASEDIR}/tools/find-dependencies" "${BASEDIR}/build" "$@"
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors}"
+       echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies}"
        cat doc/make.sh-usage
        ;;
 esac
+