From ab1ef026aa8b28113de83a8017fa95cd9f31e1b9 Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Tue, 26 Feb 2019 15:48:46 +0100 Subject: [PATCH] Merge branch 'master' into 'genofire-master-patch-74380' # Conflicts: # .gitlab-ci.yml --- .ci/build_pkgs.sh | 9 +++---- .ci/download_sdk.sh | 4 +-- .ci/prepare_build_dir.sh | 16 +++++++----- .gitignore | 56 ++++++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml | 10 +++---- README.md | 7 +++++ 6 files changed, 84 insertions(+), 18 deletions(-) create mode 100644 .gitignore diff --git a/.ci/build_pkgs.sh b/.ci/build_pkgs.sh index c9d87f7..59813fc 100644 --- a/.ci/build_pkgs.sh +++ b/.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 diff --git a/.ci/download_sdk.sh b/.ci/download_sdk.sh index 7cfa1de..a63d35c 100644 --- a/.ci/download_sdk.sh +++ b/.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 diff --git a/.ci/prepare_build_dir.sh b/.ci/prepare_build_dir.sh index bc3d262..3eb129d 100644 --- a/.ci/prepare_build_dir.sh +++ b/.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 < /dev/null -./scripts/feeds install -a > /dev/null \ No newline at end of file +./scripts/feeds install -a > /dev/null + +make defconfig > /dev/null +sed -i 's/# CONFIG_BUILD_LOG is not set/CONFIG_BUILD_LOG=y/' .config \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2c1afc --- /dev/null +++ b/.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/ \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c9cab4..4eb9532 100644 --- a/.gitlab-ci.yml +++ b/.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: \ No newline at end of file + paths: + - build_dir/bin/packages \ No newline at end of file diff --git a/README.md b/README.md index 81e5cd0..b2199f9 100644 --- a/README.md +++ b/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) \ No newline at end of file