diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 7eab3bb43..ec64361e6 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -36,3 +36,8 @@ jobs: ls openwrt/bin/targets/ tar cfz "$TAR_NAME" -C openwrt/bin/targets/ . curl -u $GH_BUILD_USERNAME:$GH_BUILD_PASSWORD -T "$TAR_NAME" "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/$LOWERCASE_TARGET/"$TAR_NAME"" + IMG_NAME="$(date +%Y%m%d)-$LOWERCASE_TARGET-$BRANCH-$HASH-upgrade.bin"; + #echo "$IMG_NAME" > lastet-upgrade.bin + ln -s "$IMG_NAME" > lastet-upgrade.bin + [ -f openwrt/image-file ] && curl -u $GH_BUILD_USERNAME:$GH_BUILD_PASSWORD -T "openwrt/$(cat openwrt/image-file)" "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/$LOWERCASE_TARGET/"$IMG_NAME"" + [ -f lastet-upgrade.bin ] && curl -u $GH_BUILD_USERNAME:$GH_BUILD_PASSWORD -T "lastet-upgrade.bin" "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/$LOWERCASE_TARGET/lastet-upgrade.bin" diff --git a/feeds/tip/tip-defaults/files/etc/init.d/tip-version b/feeds/tip/tip-defaults/files/etc/init.d/tip-version index 88f60d64c..40c7ed330 100755 --- a/feeds/tip/tip-defaults/files/etc/init.d/tip-version +++ b/feeds/tip/tip-defaults/files/etc/init.d/tip-version @@ -3,7 +3,8 @@ START=80 boot() { + DESC=$(cat /etc/openwrt_release | grep DISTRIB_DESCRIPTION= | cut -d\' -f2) HASH=$(cat /etc/openwrt_release | grep DISTRIB_TIP= | cut -d\' -f2) VERSION=$(cat /etc/openwrt_release | grep DISTRIB_TIP_VERSION= | cut -d\' -f2) - echo "$VERSION-$HASH" > /tmp/ucentral.version + echo "$DESC / TIP-$VERSION-$HASH" > /tmp/ucentral.version } diff --git a/feeds/ucentral/ucentral-client/Makefile b/feeds/ucentral/ucentral-client/Makefile index ac8e0352b..eb989f868 100644 --- a/feeds/ucentral/ucentral-client/Makefile +++ b/feeds/ucentral/ucentral-client/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/blogic/ucentral-client.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2021-02-15 -PKG_SOURCE_VERSION:=a32aeff57960bceb3fd55f140528b46f1c391821 +PKG_SOURCE_VERSION:=45b2e27d238d5366a3ef0a291ae2194d1db9c496 PKG_LICENSE:=BSD-3-Clause PKG_MAINTAINER:=John Crispin diff --git a/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral b/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral index edf72c2fe..2d1e6cef9 100755 --- a/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral +++ b/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral @@ -33,7 +33,7 @@ start_service() { [ -n "$reporting" ] && procd_append_param command -r $reporting [ "$debug" -eq 0 ] || procd_append_param command -d [ "$insecure" -eq 0 ] || procd_append_param command -i - procd_append_param command -f $(cat /tmp/ucentral.version) + procd_append_param command -f "$(cat /tmp/ucentral.version)" procd_set_param respawn 3600 5 0 procd_close_instance } diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index 70b30e950..f2f2703c9 100644 --- a/feeds/ucentral/ucentral-schema/Makefile +++ b/feeds/ucentral/ucentral-schema/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/blogic/ucentral-schema.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2021-02-15 -PKG_SOURCE_VERSION:=82c6dfe61218a015c95c0ba320d72ecac2d85f24 +PKG_SOURCE_VERSION:=81d44d33b3edd2ea2dfcbd7abc058565de2a0383 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause diff --git a/patches/0003-pending-scripts-add-gen_config.py.patch b/patches/0003-pending-scripts-add-gen_config.py.patch index 7fc2a11de..979b2a161 100644 --- a/patches/0003-pending-scripts-add-gen_config.py.patch +++ b/patches/0003-pending-scripts-add-gen_config.py.patch @@ -1,22 +1,22 @@ -From 3eeb1949584e930fb4e3b9d5369c32e58ed40ab2 Mon Sep 17 00:00:00 2001 +From 79dadbe5f9d74b3bca49e50a51f1a62be71b17a5 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 19 Jun 2020 10:45:22 +0200 -Subject: [PATCH 03/21] pending: scripts: add gen_config.py +Subject: [PATCH 01/31] pending: scripts: add gen_config.py This script is used to setup the tree based on the profiles/. Signed-off-by: John Crispin --- - scripts/gen_config.py | 188 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 188 insertions(+) + scripts/gen_config.py | 193 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 193 insertions(+) create mode 100755 scripts/gen_config.py diff --git a/scripts/gen_config.py b/scripts/gen_config.py new file mode 100755 -index 0000000000..5bc7068ae7 +index 0000000000..124dfd596a --- /dev/null +++ b/scripts/gen_config.py -@@ -0,0 +1,188 @@ +@@ -0,0 +1,193 @@ +#!/usr/bin/env python3 + +from os import getenv @@ -63,7 +63,7 @@ index 0000000000..5bc7068ae7 + + new = yaml.safe_load(profile_file.read_text()) + for n in new: -+ if n in {"profile", "target", "subtarget", "external_target"}: ++ if n in {"profile", "target", "subtarget", "external_target", "image"}: + if profile.get(n): + die(f"Duplicate tag found {n}") + profile.update({n: new.get(n)}) @@ -115,7 +115,7 @@ index 0000000000..5bc7068ae7 + for p in profile.get("feeds", []): + try: + f = profile["feeds"].get(p) -+ if all(k in f for k in ("branch", "revision", "path")): ++ if all(k in f for k in ("branch", "revision", "path", "tag")): + die(f"Please specify either a branch, a revision or a path: {f}") + if "path" in f: + feeds.append( @@ -125,6 +125,10 @@ index 0000000000..5bc7068ae7 + feeds.append( + f'{f.get("method", "src-git")},{f["name"]},{f["uri"]}^{f.get("revision")}' + ) ++ elif "tag" in f: ++ feeds.append( ++ f'{f.get("method", "src-git")},{f["name"]},{f["uri"]};{f.get("tag")}' ++ ) + else: + feeds.append( + f'{f.get("method", "src-git")},{f["name"]},{f["uri"]};{f.get("branch", "master")}' @@ -201,7 +205,8 @@ index 0000000000..5bc7068ae7 + clean_tree() + setup_feeds(profile) + generate_config(profile) -+ ++ if profile["image"]: ++ Path("image-file").write_text(profile["image"]) + print("Running make defconfig") + if run(["make", "defconfig"]).returncode: + die(f"Error running make defconfig") diff --git a/profiles/cig_wf160d.yml b/profiles/cig_wf160d.yml index 2771369a9..a8819a2fe 100644 --- a/profiles/cig_wf160d.yml +++ b/profiles/cig_wf160d.yml @@ -3,6 +3,7 @@ profile: cig_wf610d target: ipq40xx subtarget: generic description: Build image for the CIG WF160D +image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-cig_wf610d-squashfs-sysupgrade.bin include: - ucentral-ap packages: diff --git a/profiles/cig_wf188.yml b/profiles/cig_wf188.yml index 7816a2c6b..2098eb5e5 100644 --- a/profiles/cig_wf188.yml +++ b/profiles/cig_wf188.yml @@ -3,6 +3,7 @@ profile: cig_wf188n target: ipq807x subtarget: ipq60xx description: Build image for the Cigtech WF188n +image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-cig_wf188n-squashfs-sysupgrade.tar feeds: - name: ipq807x path: ../../feeds/ipq807x diff --git a/profiles/cig_wf194c.yml b/profiles/cig_wf194c.yml index 2f31a765b..13e1507f6 100644 --- a/profiles/cig_wf194c.yml +++ b/profiles/cig_wf194c.yml @@ -3,6 +3,7 @@ profile: cig_wf194 target: ipq807x subtarget: ipq807x description: Build image for the CIG WF194C +image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-cig_wf194-squashfs-sysupgrade.tar feeds: - name: ipq807x path: ../../feeds/ipq807x diff --git a/profiles/edgecore_eap101.yml b/profiles/edgecore_eap101.yml index 4d8b6c7cc..63ab8f195 100644 --- a/profiles/edgecore_eap101.yml +++ b/profiles/edgecore_eap101.yml @@ -3,6 +3,7 @@ profile: edgecore_eap101 target: ipq807x subtarget: ipq60xx description: Build image for the EdgeCore EAP101 +image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-edgecore_eap101-squashfs-sysupgrade.tar feeds: - name: ipq807x path: ../../feeds/ipq807x diff --git a/profiles/edgecore_eap102.yml b/profiles/edgecore_eap102.yml index a7cec7127..6713fb885 100644 --- a/profiles/edgecore_eap102.yml +++ b/profiles/edgecore_eap102.yml @@ -3,6 +3,7 @@ profile: edgecore_eap102 target: ipq807x subtarget: ipq807x description: Build image for the Edgecore EAP102 +image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-edgecore_eap102-squashfs-sysupgrade.tar feeds: - name: ipq807x path: ../../feeds/ipq807x diff --git a/profiles/edgecore_ecs4100-12ph.yml b/profiles/edgecore_ecs4100-12ph.yml index 4b1d074b2..3d0d898ae 100644 --- a/profiles/edgecore_ecs4100-12ph.yml +++ b/profiles/edgecore_ecs4100-12ph.yml @@ -3,6 +3,7 @@ profile: edgecore_ecs4100-12ph target: realtek subtarget: generic description: Build image for the EdgeCore ECS4100-12ph +image: bin/targets/realtek/generic/openwrt-realtek-generic-edgecore_ecs4100-12ph-squashfs-sysupgrade.bin include: - realtek - ucentral-switch diff --git a/profiles/edgecore_ecw5211.yml b/profiles/edgecore_ecw5211.yml index ea35b6b74..b10331d49 100644 --- a/profiles/edgecore_ecw5211.yml +++ b/profiles/edgecore_ecw5211.yml @@ -3,6 +3,7 @@ profile: edgecore_ecw5211 target: ipq40xx subtarget: generic description: Build image for the Edgecore ECW5211 +image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-edgecore_ecw5211-squashfs-nand-sysupgrade.bin include: - ucentral-ap packages: diff --git a/profiles/linksys_e8450.yml b/profiles/linksys_e8450-ubi.yml similarity index 63% rename from profiles/linksys_e8450.yml rename to profiles/linksys_e8450-ubi.yml index 48315f1a6..47df24c1e 100644 --- a/profiles/linksys_e8450.yml +++ b/profiles/linksys_e8450-ubi.yml @@ -3,6 +3,7 @@ profile: linksys_e8450-ubi target: mediatek subtarget: mt7622 description: Build image for the Linksys E8450 +image: bin/targets/mediatek/mt7622/openwrt-mediatek-mt7622-linksys_e8450-ubi-squashfs-sysupgrade.itb include: - ucentral-ap diffconfig: | diff --git a/profiles/linksys_ea8300.yml b/profiles/linksys_ea8300.yml index bc2c9c57c..c1ef80da5 100644 --- a/profiles/linksys_ea8300.yml +++ b/profiles/linksys_ea8300.yml @@ -3,6 +3,7 @@ profile: linksys_ea8300 target: ipq40xx subtarget: generic description: Build image for the Linksys ea8300 +image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-edgecore_ecw5211-squashfs-nand-sysupgrade.bin include: - ucentral-ap packages: diff --git a/profiles/tplink_cpe210_v3.yml b/profiles/tplink_cpe210_v3.yml index c9f03a614..2351766ea 100644 --- a/profiles/tplink_cpe210_v3.yml +++ b/profiles/tplink_cpe210_v3.yml @@ -3,5 +3,6 @@ profile: tplink_cpe210-v3 target: ath79 subtarget: generic description: Build image for the TPLink CPE 210 v3 +image: bin/targets/ath79/generic/openwrt-ath79-generic-tplink_cpe210-v3-squashfs-sysupgrade.bin include: - ucentral-ap-light diff --git a/profiles/tplink_ex227.yml b/profiles/tplink_ex227.yml index 176673140..4f3e234b5 100644 --- a/profiles/tplink_ex227.yml +++ b/profiles/tplink_ex227.yml @@ -3,6 +3,7 @@ profile: tplink_ex227 target: ipq807x subtarget: ipq807x description: Build image for the TP-Link EX227 +image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-tplink_ex227-squashfs-sysupgrade.tar feeds: - name: ipq807x path: ../../feeds/ipq807x diff --git a/profiles/tplink_ex447.yml b/profiles/tplink_ex447.yml index fb39b1458..530f2e157 100644 --- a/profiles/tplink_ex447.yml +++ b/profiles/tplink_ex447.yml @@ -3,6 +3,7 @@ profile: tplink_ex447 target: ipq807x subtarget: ipq807x description: Build image for the TP-Link EX447 +image: bin/targets/ipq807x/ipq807x/openwrt-ipq807x-tplink_ex447-squashfs-sysupgrade.tar feeds: - name: ipq807x path: ../../feeds/ipq807x