Merge branch 'genofire-master-patch-74380' into 'master'

fix ci

See merge request genofire/wifictld!1

.ci/build_pkgs.sh

@@ -1,7 +1,7 @@
-cd /builds/$CI_PROJECT_PATH/wireless/
-PKGS="wifictld"
+cd $CI_PROJECT_DIR/wireless/
+PKGS=$(ls)
 
-cd  ~/build_dir
+cd $CI_PROJECT_DIR/build_dir
 
 echo "=== Found new/modified packages: $PKGS"
 for PKG in $PKGS ; do
@@ -10,7 +10,6 @@ for PKG in $PKGS ; do
 
     echo "===+ Check package: $PKG"
     make "package/$PKG/check" V=s 2>&1 | tee logtmp
-    RET=${PIPESTATUS[0]}
 
     if [ $RET -ne 0 ]; then
         echo   "=> Package check failed: $RET)"
@@ -24,7 +23,7 @@ for PKG in $PKGS ; do
         echo   "=> Package HASH check failed"
         exit 1
     fi
-    echo_green "=> Package check OK"
+    echo "=> Package check OK"
 done
 
 

.ci/download_sdk.sh

@@ -1,5 +1,5 @@
-mkdir ~/sdk
-cd ~/sdk
+mkdir -p $CI_PROJECT_DIR/tmp
+cd $CI_PROJECT_DIR/tmp
 
 curl "https://$SDK_HOST/$SDK_PATH/sha256sums" -sS -o sha256sums
 curl "https://$SDK_HOST/$SDK_PATH/sha256sums.asc" -sS -o sha256sums.asc

.ci/prepare_build_dir.sh

@@ -1,18 +1,22 @@
+mkdir -p $CI_PROJECT_DIR/build_dir
+cd  $CI_PROJECT_DIR/build_dir
 
-mkdir ~/build_dir
-cd  ~/build_dir
-
-tar Jxf ~/sdk/$SDK_FILE --strip=1
+tar Jxf $CI_PROJECT_DIR/tmp/$SDK_FILE --strip=1
 
 cat > feeds.conf <<EOF
+src-git base https://git.openwrt.org/openwrt/openwrt.git
 src-git packages https://git.openwrt.org/feed/packages.git
 src-git luci https://git.openwrt.org/project/luci.git
 src-git routing https://git.openwrt.org/feed/routing.git
 src-git telephony https://git.openwrt.org/feed/telephony.git
+src-git gluon https://github.com/freifunk-gluon/packages.git
 
-src-link $CI_PROJECT_NAME /builds/$CI_PROJECT_PATH
+src-link $CI_PROJECT_NAME $CI_PROJECT_DIR
 EOF
 
 cat feeds.conf
 ./scripts/feeds update -a > /dev/null
-./scripts/feeds install -a > /dev/null
+./scripts/feeds install -a > /dev/null
+
+make defconfig > /dev/null
+sed -i 's/# CONFIG_BUILD_LOG is not set/CONFIG_BUILD_LOG=y/' .config

.gitignore

@@ -0,0 +1,56 @@
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+
+tmp/
+build_dir/

.gitlab-ci.yml

@@ -12,11 +12,11 @@ compile:
     stage: compile
     script:
         - echo "==== Download the SDK ===="
-        - sh /builds/$CI_PROJECT_PATH/.ci/download_sdk.sh
+        - sh .ci/download_sdk.sh
         - echo "==== Prepare build_dir ===="
-        - sh /builds/$CI_PROJECT_PATH/.ci/prepare_build_dir.sh
+        - sh .ci/prepare_build_dir.sh
         - echo "==== build packages ===="
-        - sh /builds/$CI_PROJECT_PATH/.ci/build_pkgs.sh
-        - ls /home/build/build_dir/bin/packages
+        - sh .ci/build_pkgs.sh
     artifacts:
-        paths:
+        paths:
+        - build_dir/bin/packages

README.md

@@ -1,5 +1,7 @@
 # Wifi control deamon packages feed
 
+[![Build Status](https://dev.sum7.eu/genofire/wifictld/badges/master/build.svg)](https://dev.sum7.eu/genofire/wifictld/pipelines)
+
 ## Description
 
 This is an OpenWrt package feed containing community 
@@ -26,3 +28,8 @@ run:
 
 The wifictld packages should now appear in menuconfig.
 
+
## Snapshots / Download
+
+[wifictld_1.0-1_mips_24kc.ipk](https://dev.sum7.eu/genofire/wifictld/-/jobs/artifacts/master/raw/build_dir/bin/packages/mips_24kc/wifictld/wifictld_1.0-1_mips_24kc.ipk?inline=false&job=compile)
+[wifictld-mini_1.0-1_mips_24kc.ipk](https://dev.sum7.eu/genofire/wifictld/-/jobs/artifacts/master/raw/build_dir/bin/packages/mips_24kc/wifictld/wifictld-mini_1.0-1_mips_24kc.ipk?inline=false&job=compile)
+[respondd-module-wifictld_1-1_mips_24kc.ipk](https://dev.sum7.eu/genofire/wifictld/-/jobs/artifacts/master/raw/build_dir/bin/packages/mips_24kc/wifictld/respondd-module-wifictld_1-1_mips_24kc.ipk?inline=false&job=compile)