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 4acce807feb3b78beb952d14d42cc297a541a924..d2ce7d4d3faebdcc666fd6e5f6f63b04fffd2213 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1355,8 +1355,6 @@ buildipfire() {
   lfsmake2 python-daemon
   lfsmake2 python-ipaddress
   lfsmake2 glib
-  lfsmake2 GeoIP
-  lfsmake2 geoip-database
   lfsmake2 ntp
   lfsmake2 openssh
   lfsmake2 fontconfig
@@ -1643,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() {
@@ -1707,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
@@ -2002,3 +2000,4 @@ find-dependencies)
        cat doc/make.sh-usage
        ;;
 esac
+