Developing lightweight computation at the DSG edge

Commit 9b889d94 authored by Roger Pueyo Centelles's avatar Roger Pueyo Centelles
Browse files

Merge branch 'master' into testing


Signed-off-by: default avatarRoger Pueyo Centelles <roger.pueyo@guifi.net>
parents 642cfe30 30a7413e
......@@ -3,6 +3,8 @@
17.01.2
17.01.3
17.01.4
18.06
18.06.0
tmp
dl
feeds
......@@ -12,3 +14,4 @@ files
*.local
communities/
lede/
openwrt/
......@@ -63,7 +63,8 @@ usage() {
echo " --remote : instead of building local SDK packages. Use only remote repositories for cooking"
echo " --community=<name/prof> : specify which network community and profile device to use (if any)"
echo " --no-update : do not update package list when cooking (requires patch_ib_no_update.sh snippet)"
echo " -r : make a qMp release"
echo " -r : make a full qMp release"
echo " --refresh : refresh a qMp release in this directory"
echo ""
}
......@@ -356,7 +357,7 @@ download_sdk() {
local output="$release/$target"
[ ! -d "$output" ] && mkdir -p "$output"
local sdk_file="$(wget -q -O- $url | grep lede-sdk | grep href | awk -F\> '{print $4}' | awk -F\< '{print $1}')"
local sdk_file="$(wget -q -O- $url | grep lede-sdk | grep -Eoi '<a [^>]+>' | grep -Eo 'href="[^\"]+"' | cut -d '=' -f 2 | sed 's/\"//g')"
echo "-> Downloading $url/$sdk_file"
wget -c "$url/$sdk_file" -O "$tmp_dir/$sdk_file" || {
echo "-> Error, cannot download SDK $url/$sdk_file"
......@@ -394,7 +395,7 @@ download_ib() {
local url="$base_url/$target"
local output="$release/$target"
[ ! -d "$output" ] && mkdir -p "$output"
local ib_file="$(wget -q -O- $url | grep lede-imagebuilder | grep href | awk -F\> '{print $4}' | awk -F\< '{print $1}')"
local ib_file="$(wget -q -O- $url | grep lede-imagebuilder | grep -Eoi '<a [^>]+>' | grep -Eo 'href="[^\"]+"' | cut -d '=' -f 2 | sed 's/\"//g')"
echo "-> Downloading $url/$ib_file"
wget -c "$url/$ib_file" -O "$tmp_dir/$ib_file" || {
echo "-> Error, cannot download ImageBuilder $url/$ib_file"
......@@ -451,8 +452,22 @@ join_packages() {
}
make_qmp_release() {
DISTCL="lede"-$lede_release
DISTLEGACY="lede-"$lede_release
# Download the feeds (./cooker -f)
download_feeds
# Update feeds if refresh_release is on
[ -n "$refresh_release" ] && update_feeds
# Run snippets
./snippets/regdbus.sh
# Build the SDK and the packages locally for each architecture
force_local=1
build_all_sdk
DISTCL="lede"
DISTLEGACY="lede"
COMBINEDEXT4IMG="combined-ext4.img.gz"
COMBINEDEXT4VDI="combined-ext4.vdi"
COMBINEDEXT4VMDK="combined-ext4.vmdk"
......@@ -466,8 +481,6 @@ make_qmp_release() {
SQUASHSYSUPGRADE="squashfs-sysupgrade.bin"
SQUASHFSSDCARD="squashfs-sdcard.img.gz"
#build_all_sdk
[ -f qmp.profiles.conf ] && . qmp.profiles.conf
mkdir -p $bin_output
......@@ -478,6 +491,8 @@ make_qmp_release() {
flavor=$FLAVOR
join_packages $EXTRAPKGS
cook "$ARCH/$SUBARCH" "$PROFILE"
local output_dir="$PWD/$bin_output/$ARCH/$SUBARCH/$PROFILE/$FLAVOR"
......@@ -663,6 +678,10 @@ while true; do
qmp_release=1
shift
;;
--refresh)
refresh_release=1
shift
;;
-h)
usage
break
......
release=17.01.4
base_url=https://downloads.lede-project.org/releases/$release/targets/
base_url=https://downloads.openwrt.org/snapshots/targets/
communities_git=https://github.com/libremesh/network-profiles.git
communities_dir=communities
tmp_dir=tmp
......
src-git base https://github.com/lede-project/source.git;v17.01.4
src-git packages https://git.lede-project.org/feed/packages.git;lede-17.01
src-git luci https://git.lede-project.org/project/luci.git;lede-17.01
src-git routing https://git.lede-project.org/feed/routing.git;lede-17.01
src-git telephony https://git.lede-project.org/feed/telephony.git;lede-17.01
src-git base https://github.com/openwrt/openwrt.git;v17.01.4
src-git packages https://github.com/openwrt/packages.git;lede-17.01
src-git luci https://github.com/openwrt/luci.git;lede-17.01
src-git routing https://github.com/openwrt-routing/packages.git;lede-17.01
src-git telephony https://git.openwrt.org/feed/telephony.git;lede-17.01
src-git qmp https://dev.qmp.cat/qmp.git;testing
src-git libremap https://github.com/libremap/libremap-agent-openwrt.git;master
src-git b6m https://dev.qmp.cat/b6m.git;openwrt
src-git ncr https://dev.qmp.cat/ncr.git;master
# Flavors
lede_vanilla="luci"
qmp_cli="qmp-system -opkg -wpad-mini hostapd-mini -kmod-usb-core -kmod-usb-ledtrig-usbport -kmod-usb2 -ppp -ppp-mod-pppoe -6relayd -odhcp6c -odhcpd -ip6tables -firewall"
qmp_tiny="qmp-tiny-node -opkg -wpad-mini hostapd-mini -kmod-usb-core -kmod-usb-ledtrig-usbport -kmod-usb2 -ppp -ppp-mod-pppoe -6relayd -odhcp6c -odhcpd -ip6tables -firewall"
qmp_small="qmp-small-node opkg"
qmp_big="qmp-big-node opkg"
openwrt_vanilla="luci"
qmp_cli="qmp-system -opkg -kmod-usb-core -kmod-usb-ledtrig-usbport -kmod-usb2 -ppp -ppp-mod-pppoe -6relayd -odhcp6c -odhcpd -ip6tables -firewall"
qmp_tiny="qmp-tiny-node -opkg -kmod-usb-core -kmod-usb-ledtrig-usbport -kmod-usb2 -ppp -ppp-mod-pppoe -6relayd -odhcp6c -odhcpd -ip6tables -firewall"
qmp_small="qmp-small-node opkg qmp-ncd"
qmp_big="qmp-big-node opkg qmp-ncd qmp-ncgui"
SUPPORTED_PROFILES="alfa-nx alix bullet cf-wr800n dir-810l dragino2 lamobo-r1 linkit7688 mc-mac1200r microwrt miwifi-mini nslm5-xw nsm2 nsm5 nsm5-xw nslm5-xw pico2 rb921gs-5Hpacd-15s rocket-m rocket-m-xw rs rspro soekris45xx tl-2543-v1 tl-mr3020-v1 tl-mr3040-v1 tl-wa7510n tl-wdr3500-v1 tl-wdr3600 tl-wdr4300 tl-wdr4900-v1 tl-wr703n-v1 tl-wr740n tl-wr743nd-v1 tl-wr841-v10 tl-wr841-v7 tl-wr841-v8 tl-wr841-v9 tl-wr842n-v1 uap-pro unifiac-lite unifi-ap vocore-16M vocore-8M wl-wn575a3 wrtnode wt1520-4M wt1520-8M wt3020-4M wt3020-8M x86 x86-64 zbt-ape522ii"
EXTRAPKGS=""
FACTORY=""
SYSUPGRADE=""
SQUASHIMAGE=""
......@@ -43,6 +43,7 @@ EXT4IMAGE=""
ARCH=x86
SUBARCH=64
FLAVOR=qmp_big
EXTRAPKGS=kmod-ath9k
PROFILE=Generic
SQUASHIMAGE=$DISTCL-$FLAVOR-$ARCH-$SUBARCH-$COMBINEDSQUASHIMG
EXT4IMAGE=$DISTCL-$FLAVOR-$ARCH-$SUBARCH-$COMBINEDEXT4IMG
......
......@@ -22,3 +22,5 @@ CONFIG_PACKAGE_libremap-agent=m
CONFIG_PACKAGE_lunced=m
CONFIG_PACKAGE_nc=m
CONFIG_PACKAGE_b6m=m
CONFIG_PACKAGE_qmp-ncd=m
CONFIG_PACKAGE_qmp-ncgui=m
......@@ -28,4 +28,4 @@ sed -i -e 's/ath10k-firmware-qca9887-ct-ct/ath10k-firmware-qca9887-ct/g' $filena
#( cd $base_feed && git apply $patch_file && {
# echo "Patch applied, now you can use the special country US when you deploy a mesh network on International Waters"
#} || echo "Patch does not apply, maybe it is already applied or LEDE source has changed" )
#} || echo "Patch does not apply, maybe it is already applied or OpenWrt source has changed" )
......@@ -18,17 +18,17 @@ index c4a9b2d15f..ec2c21543a 100644
+++ b/package/kernel/mac80211/files/regdb.txt
@@ -1180,8 +1180,8 @@ country TW: DFS-FCC
(5725 - 5850 @ 80), (30)
country TZ:
- (2402 - 2482 @ 40), (20)
- (5735 - 5835 @ 80), (30)
+ (2402 - 2484 @ 40), (30)
+ (5150 - 5835 @ 80), (30)
# Source:
# #914 / 06 Sep 2007: http://www.ucrf.gov.ua/uk/doc/nkrz/1196068874
EOF
( cd $base_feed && git apply $patch_file && {
echo "Patch applied, now you can use the special channel TZ when you deploy a mesh network on International Waters"
} || echo "Patch does not apply, maybe it is already applied orLEDE source has changed" )
} || echo "Patch does not apply, maybe it is already applied or OpenWrt source has changed" )
......@@ -41,4 +41,4 @@ EOF
( cd $base_feed && git apply $patch_file && {
echo "Patch applied, now you can use the special country US when you deploy a mesh network on International Waters"
} || echo "Patch does not apply, maybe it is already applied or LEDE source has changed" )
} || echo "Patch does not apply, maybe it is already applied or OpenWrt source has changed" )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment