.gitlab-ci.yml

 stages:
 - build
-- dl_stage
 - test
 - deploy
 

build.json

@@ -37,8 +37,10 @@
 {
  "targets": [
 # ------------- default values ------------------------------
+# this block must come always first, because the first block is used
+# as default
 	{	
-		"name":"default",			# must be "default", this block defines default values that are used
+		"name":"default",			# currently just an unused name (only displayed) 
 							# if following blocks do not specifiy there own value
 		"target":"ar71xx",
 		"subtarget":"generic",
@@ -62,7 +64,7 @@
 		# generates the feeds/feeds-[selector].conf
 		# for short commit value use: git log --abbrev-commit
 		"feeds" : [
-				{"type":"src-link", 	"name":"ddmesh_own",	"src":"../../../feeds/19.07/feeds-own" },
+				{"type":"src-link", 	"name":"ddmesh_own",	"src":"feeds-own" },	# feeds/<selector>/feeds-own
 				{"type":"src-git", 	"name":"packages",	"src":"https://git.openwrt.org/feed/packages.git",	"rev":"4f717a6"},
 			#	{"type":"src-git", 	"name":"luci",		"src":"https://git.openwrt.org/project/luci.git",	"rev":"204293a76"},
 				{"type":"src-git", 	"name":"routing",	"src":"https://git.openwrt.org/feed/routing.git",	"rev":"def3cd5"},
@@ -87,7 +89,7 @@
 		"selector-feeds":"18.06",		# used to select feeds
 		"selector-patches":"18.06",		# used to select patches
 		"feeds" : [
-				{"type":"src-link", 	"name":"ddmesh_own",	"src":"../../../feeds/18.06/feeds-own" },
+				{"type":"src-link", 	"name":"ddmesh_own",	"src":"feeds-own" },
 				{"type":"src-git", 	"name":"packages",	"src":"https://git.openwrt.org/feed/packages.git",	"rev":"de3766173"},
 				{"type":"src-git", 	"name":"luci",		"src":"https://git.openwrt.org/project/luci.git",	"rev":"204293a76"},
 				{"type":"src-git", 	"name":"routing",	"src":"https://git.openwrt.org/feed/routing.git",	"rev":"ff5100e"},
@@ -138,6 +140,11 @@
 		"name":"openwrt:ipq40xx.generic",
 		"target":"ipq40xx",
 		"subtarget":"generic"
+	},
+	{	
+		"name":"openwrt:ath79.nand",
+		"target":"ath79",
+		"subtarget":"nand"
 	}
  ]
 }

build.sh

@@ -15,6 +15,9 @@ WORK_DIR=workdir
 CONFIG_DIR=openwrt-configs
 OPENWRT_PATCHES_DIR=openwrt-patches
 OPENWRT_PATCHES_TARGET_DIR=openwrt-patches-target
+DDMESH_STATUS_DIR=".ddmesh"	# used to store build infos like openwrt_patches_target states
+DDMESH_PATCH_STATUS_DIR="$DDMESH_STATUS_DIR/patches-applied"
+
 
 # -------------------------------------------------------------------
 
@@ -97,9 +100,9 @@ listTargets()
  fi
  targetIdx=$(( targetIdx + 1 ))
 
- printf -- '----------------------------------------------------------------------------------------------------------------------------\n'
- printf  " %-40s | %-40s | %-7s | %-7s | %-7s | %-s \n" target openwrt_rev config feeds files patches
- printf -- '------------------------------------------+------------------------------------------+---------+---------+---------+--------\n'
+ printf -- '-------------------------------------------------------------------------------------------------\n'
+ printf  " %-40s | %-13s | %-7s | %-7s | %-7s | %-s \n" target openwrt_rev config feeds files patches
+ printf -- '------------------------------------------+---------------+---------+---------+---------+--------\n'
  # run through rest of json
  while true
  do
@@ -137,10 +140,10 @@ listTargets()
 		test -n "$_variant" && target="$target.$_variant"
 	fi 
 	test -z "$target" && break
- 	printf  " %-40s | %-40s | %-7s | %-7s | %-7s | %-7s \n" $target $openwrt_rev $_selector_config $_selector_feeds $_selector_files $_selector_patches
+ 	printf  " %-40s | %-13s | %-7s | %-7s | %-7s | %-7s \n" $target "${openwrt_rev:0:10}..." $_selector_config $_selector_feeds $_selector_files $_selector_patches
 	targetIdx=$(( targetIdx + 1 ))
  done
- printf -- '----------------------------------------------------------------------------------------------------------------------------\n'
+ printf -- '-------------------------------------------------------------------------------------------------\n'
 }
 
 
@@ -263,7 +266,6 @@ setup_buildroot ()
 		rm -rf $buildroot
 
 		mkdir -p $buildroot
-		mkdir -p $openwrt_dl_dir
 
 		#check if we have already downloaded the openwrt revision
 		if [ -f $openwrt_dl_tgz ]
@@ -341,6 +343,21 @@ setup_buildroot ()
 
 } # setup_buildroot
 
+# ---------- create directories: dl/workdir -----------
+# only create top-level directories if thoses do not not
+# exisist. I do not simply call 'mkdir -p'. This is because
+# gitlab runner may store the content somewhere else to
+# and creates a symlink to this location.
+# This avoids using caching and artifacts copying between
+# jobs and stages. cache and workdir are only stored on
+# server where the runner is running.
+# If owner of the runner doesn't setup a symlink then
+# all files are stored within current directory (where build.sh
+# is located)
+
+test -L $DL_DIR || mkdir -p $DL_DIR
+test -L $WORK_DIR || mkdir -p $WORK_DIR
+
 # ---------- process all targets ------------
 OPT="--raw-output" # do not excape values
 
@@ -481,11 +498,18 @@ EOM
 		_feed_name=$(echo $feed | jq $OPT '.name')
 		_feed_src=$(echo $feed | jq $OPT '.src')
 		_feed_rev=$(echo $feed | jq $OPT '.rev')
-		
-		# if we have a feed revision, then add it. "^° is a special character
-		# followed by a "commit" (hash). openwrt then checks out this revision
-		test "$_feed_rev" = "null" && _feed_rev=""
-		test -n "$_feed_rev" && _feed_rev="^$_feed_rev"
+
+		# for local feeds set correct absolute filename because when workdir is a symlink, relative
+		# path are note resolved correctly. Also we need to use $_selector_feeds 
+		if [ "$_feed_type" = "src-link" ]; then
+			_feed_src="$RUN_DIR/feeds/$_selector_feeds/$_feed_src"
+			_feed_rev=""	# src-link does not have a rev, because it is already in current git repo
+		else	
+			# if we have a feed revision, then add it. "^° is a special character
+			# followed by a "commit" (hash). openwrt then checks out this revision
+			test "$_feed_rev" = "null" && _feed_rev=""
+			test -n "$_feed_rev" && _feed_rev="^$_feed_rev"
+		fi
 
 		printf "%s %s %s\n" $_feed_type $_feed_name $_feed_src$_feed_rev  >>$feedConfFileName
 
@@ -535,7 +559,8 @@ EOM
 	fi
 
 	#try to apply target patches
-        echo -e $C_PURPLE"apply target patches"$C_GREEN
+	mkdir -p $DDMESH_PATCH_STATUS_DIR
+        echo -e $C_PURPLE"apply target patches"$C_NONE
         idx=0
         while true
         do
@@ -546,13 +571,23 @@ EOM
 
 		# check patch
 
-		[ -f $RUN_DIR/$OPENWRT_PATCHES_TARGET_DIR/$_selector_config/$entry ] && echo -e "[$idx] $C_GREEN$entry$C_NONE" || break
-
-                if patch --dry-run -t --directory=$RUN_DIR/$buildroot -p0 < $RUN_DIR/$OPENWRT_PATCHES_TARGET_DIR/$_selector_config/$entry ; then
-			patch -t --directory=$RUN_DIR/$buildroot -p0 < $RUN_DIR/$OPENWRT_PATCHES_TARGET_DIR/$_selector_config/$entry
+		if [ -f $RUN_DIR/$OPENWRT_PATCHES_TARGET_DIR/$_selector_patches/$entry ]; then
+			printf "[$idx] $C_GREEN$entry$C_NONE"
+
+			# if patch is not applied yet
+			if [ ! -f $DDMESH_PATCH_STATUS_DIR/$entry ]; then
+		                if patch -t --directory=$RUN_DIR/$buildroot -p0 < $RUN_DIR/$OPENWRT_PATCHES_TARGET_DIR/$_selector_patches/$entry >/dev/null; then
+					printf " -> $C_GREEN%s$C_NONE\n" "ok"
+					touch $DDMESH_PATCH_STATUS_DIR/$entry
+				else
+					printf " -> "$C_RED"failed"$C_NONE"\n"
+					exit 1
+				fi
+			else
+					printf " -> already applied\n"
+			fi
 		else
-			echo -e $C_RED"cannot apply last patch"$C_NONE
-			exit 1
+			echo -e $C_RED"Warning: patch [$_selector_patches/$entry] not found!"$C_NONE
 		fi
         done
 
@@ -587,7 +622,7 @@ EOM
 
 	# continue with next target in build.targets	
 	if [ $error -ne 0 ]; then
-		echo -e $C_RED"Error: build error - make reported an error"$C_NONE
+		echo -e $C_RED"Error: build error"$C_NONE
 		if [ "$REBUILD_ON_FAILURE" = "1" ]; then
 			echo -e $C_PURPLE".......... rerun build with V=s ........................"$C_NONE
 			time -p make $BUILD_PARAMS V=s -j1

files/common/etc/hotplug.d/iface/01-eventlog

 #!/bin/sh
-logger -t ddmesh "network-hotplug iface: network:[$INTERFACE] interface:$DEVICE $ACTION"
+logger -t ddmesh "network-hotplug iface: [$INTERFACE] $ACTION type:$DEVTYPE interface:[$DEVICENAME] devpath:$DEVPATH"
+

files/common/etc/hotplug.d/iface/70-firewall-addons

 
 test -f /tmp/freifunk-running || exit 0
 
-logger -t "hotplug 70-iface" "$INTERFACE - action:$ACTION"
+logger -t "hotplug 70-firewall-addons" "$INTERFACE - action:$ACTION"
 [ ifup = "$ACTION" -o ifdown = "$ACTION" ] && {
 	[ wan = "$INTERFACE" ] && /usr/lib/ddmesh/ddmesh-firewall-addons.sh update
 	[ lan = "$INTERFACE" ] && /usr/lib/ddmesh/ddmesh-firewall-addons.sh update

files/common/etc/hotplug.d/net/01-eventlog

 #!/bin/sh
-logger -t ddmesh "network-hotplug net: [$INTERFACE] $ACTION type:$DEVTYPE"
+logger -t ddmesh "network-hotplug net: [$INTERFACE] $ACTION type:$DEVTYPE interface:[$DEVICENAME] devpath:$DEVPATH"
 

files/common/usr/lib/ddmesh/ddmesh-bootconfig.sh

@@ -388,7 +388,7 @@ config_update() {
 		uci -q del ddmesh.@backbone_client[$i].password
 		uci -q set ddmesh.@backbone_client[$i].port="5002"
 		#lookup key
-		for k in $(seq 1 10)
+		for k in $(seq 1 30)
 		do
 			kk=$(( $k - 1))
 			h=$(uci -q get credentials.@backbone[$kk].host)
@@ -789,11 +789,13 @@ setup_mesh_on_wire()
 	 wan_phy="$(uci -q get network.wan.ifname)"
 
 	 if [ "$mesh_on_lan" = "1" ]; then
+		logger -s -t "$LOGGER_TAG" "activate mesh-on-lan for $lan_phy"
  		brctl delif $lan_ifname $lan_phy
 	 	brctl addif $mesh_lan_ifname $lan_phy
 	 fi
 
 	 if [ "$mesh_on_wan" = "1" -a "$wan_iface_present" = "1" ]; then
+		logger -s -t "$LOGGER_TAG" "activate mesh-on-wan for $wan_phy"
  		brctl delif $wan_ifname $wan_phy
 	 	brctl addif $mesh_wan_ifname $wan_phy
 	 fi

files/common/www/license.cgi

@@ -69,6 +69,3 @@ esac
 
 . /usr/lib/www/page-post.sh
 
-fi #autosetup
-
-

gen-upload.sh

@@ -72,7 +72,8 @@ directory_suffix=$2
 SAVED_SYSTEM_PATH=$PATH
 
 #extract version files to extract directory components
-fwversion=$(cat $firmwareroot/files/common/etc/version)
+fwversion="$(cat $firmwareroot/files/common/etc/version)"
+fwdate="$(date)"
 
 if [ -z "$fwversion" ]; then
 	printf "ERROR: firmware version not detected (invalid path)\n"
@@ -100,8 +101,9 @@ target_dir=$output_dir/$fwversion
 
 gen_download_json_start()
 {
-  output_path=$1 # output path "firmware/4.2.15"
-  fw_version=$2 # firmware version
+  output_path="$1" # output path "firmware/4.2.15"
+  fw_version="$2" # firmware version
+  fw_date="$3" # build date
 
 	printf $C_YELLOW"create download.json"$C_NONE"\n"
 
@@ -110,6 +112,7 @@ gen_download_json_start()
 	printf "{\n" >> $output_path/$OUTPUT_DOWNLOAD_JSON_FILENAME
 	printf " \"json_version\":\"1\",\n" >> $output_path/$OUTPUT_DOWNLOAD_JSON_FILENAME
 	printf " \"firmware_version\":\"$fw_version\",\n" >> $output_path/$OUTPUT_DOWNLOAD_JSON_FILENAME
+	printf " \"firmware_date\":\"$fw_date\",\n" >> $output_path/$OUTPUT_DOWNLOAD_JSON_FILENAME
 	printf " \"fileinfo\": [\n" >> $output_path/$OUTPUT_DOWNLOAD_JSON_FILENAME
 
 	# generate new input file
@@ -289,7 +292,7 @@ printf "$fwversion\n" >$target_dir/version
 #################################################################################################
 # start json
 #################################################################################################
-gen_download_json_start $target_dir $fwversion
+gen_download_json_start "$target_dir" "$fwversion" "$fwdate"
 
 
 #################################################################################################

gitlab-ci/m2runner-nightly.yml

 ######## m2runner ################
-# there are two jobs, one for each commit and one for nightly scheduled job
-# nightly is the one that keeps artifacts (result of built) and which
-# then deployed later (see option "only").
-# deploy stage should be added.
+
+before_script:
+  - ln -s ~/mycache/dl
+  - ln -s ~/mycache/workdir
 
 nightly:ar71xx.tiny:
   only:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}-nightly
-    paths:
-    - dl
-# don't keep workdir
   script:
     - ./build.sh ar71xx.tiny rerun -j8
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
-    expire_in: 2 days
-    paths:
-     - workdir/*/bin/targets/ar71xx/tiny
-#     - dl
   tags:
   - m2runner
 
@@ -29,20 +17,8 @@ nightly:ar71xx.generic:
   only:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}-nightly
-    paths:
-    - dl
-# don't keep workdir
   script:
     - ./build.sh ar71xx.generic rerun -j8
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
-    expire_in: 2 days
-    paths:
-    - workdir/*/bin/targets/ar71xx/generic
-#    - dl
   tags:
   - m2runner
 
@@ -50,20 +26,8 @@ nightly:x86.generic:
   only:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}-nightly
-    paths:
-    - dl
-# don't keep workdir
   script:
     - ./build.sh x86.generic rerun -j8
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
-    expire_in: 2 days
-    paths:
-    - workdir/*/bin/targets/x86/generic
-#    - dl
   tags:
   - m2runner
 
@@ -71,20 +35,8 @@ nightly:ramips.mt7621:
   only:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}-nightly
-    paths:
-    - dl
-# don't keep workdir
   script:
     - ./build.sh ramips.mt7621 rerun -j8
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
-    expire_in: 2 days
-    paths:
-    - workdir/*/bin/targets/ramips
-#    - dl
   tags:
   - m2runner
 
@@ -92,20 +44,8 @@ nightly:ipq40xx.generic:
   only:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}-nightly
-    paths:
-    - dl
-# don't keep workdir
   script:
     - ./build.sh ipq40xx.generic rerun -j8
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
-    expire_in: 2 days
-    paths:
-    - workdir/*/bin/targets/ipq40xx/generic
-#    - dl
   tags:
   - m2runner
 
@@ -113,48 +53,17 @@ nightly:lantiq.xrx200:
   only:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}-nightly
-    paths:
-    - dl
-# don't keep workdir
   script:
     - ./build.sh lantiq.xrx200 rerun -j8
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
-    expire_in: 2 days
-    paths:
-    - workdir/*/bin/targets/lantiq/xrx200
-#    - dl
   tags:
   - m2runner
 
-
-
-# this build job will wait for all other jobs to ensure
-# that all downloaded packages are stored. 
-# beause jobs are run parallel (no specific order) I have
-# to use a separae stage. 
-# all artifacts are passed to higher stage.
-# because I use the same cache, I can simply pass the "dl" as
-# artifact to next stage.
-nightly:dl:
+nightly:ath79.nand:
   only:
     - schedules
-  stage: dl_stage
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}-nightly
-    paths:
-    - dl
-  script: 
-    - 'true'
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
-    paths:
-    - dl
-    - workdir/*/bin/targets
+  stage: build
+  script:
+    - ./build.sh ath79.nand rerun -j8
   tags:
   - m2runner
 
@@ -166,7 +75,7 @@ nightly:deploy:
     - ./gen-upload.sh all
     # runner must have ssh key that are added to download server. on download server there is a user "stephan" who owns the download directories
     # add the runners public key to user stephan authorized_keys file
-    - rsync -avz --info=all1 --delete -EH --progress final_output/*/* stephan@download.lxc:/var/www/files/nightlybuilt/
+    - rsync -avz --info=all1 --delete -EH --progress final_output/*/* stephan@download.lxc:/var/www/files/nightly/
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
     expire_in: 2 days

gitlab-ci/m2runner.yml

 ######## m2runner ################
 
+before_script:
+  - ln -s ~/mycache/dl
+  - ln -s ~/mycache/workdir
+
 ar71xx.tiny:
   except:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}
-    paths:
-    - dl
-    - workdir/*
   script:
     - ./build.sh ar71xx.tiny rerun -j2
   tags:
@@ -19,12 +17,6 @@ ar71xx.generic:
   except:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}
-    paths:
-    - dl
-    - workdir/*
   script:
     - ./build.sh ar71xx.generic rerun -j2
   tags:
@@ -34,12 +26,6 @@ x86.generic:
   except:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}
-    paths:
-    - dl
-    - workdir/*
   script:
     - ./build.sh x86.generic rerun -j2
   tags:
@@ -49,12 +35,6 @@ ramips.mt7621:
   except:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}
-    paths:
-    - dl
-    - workdir/*
   script:
     - ./build.sh ramips.mt7621 rerun -j2
   tags:
@@ -64,12 +44,6 @@ ipq40xx.generic:
   except:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}
-    paths:
-    - dl
-    - workdir/*
   script:
     - ./build.sh ipq40xx.generic rerun -j2
   tags:
@@ -79,14 +53,17 @@ lantiq.xrx200:
   except:
     - schedules
   stage: build
-  cache:
-    untracked: true
-    key: ${CI_COMMIT_REF_SLUG}
-    paths:
-    - dl
-    - workdir/*
   script:
     - ./build.sh lantiq.xrx200 rerun -j2
   tags:
   - m2runner
 
+ath79.nand:
+  except:
+    - schedules
+  stage: build
+  script:
+    - ./build.sh ath79.nand rerun -j2
+  tags:
+  - m2runner
+

openwrt-configs/19.07/config.ipq40xx.generic

@@ -2784,9 +2784,9 @@ CONFIG_PACKAGE_px5g-mbedtls=y
 # CONFIG_PACKAGE_dmesg is not set
 # CONFIG_PACKAGE_dropbearconvert is not set
 # CONFIG_PACKAGE_flock is not set
-CONFIG_PACKAGE_fritz-caldata=m
-CONFIG_PACKAGE_fritz-tffs=m
-# CONFIG_PACKAGE_fritz-tffs-nand is not set
+CONFIG_PACKAGE_fritz-caldata=y
+CONFIG_PACKAGE_fritz-tffs=y
+CONFIG_PACKAGE_fritz-tffs-nand=y
 # CONFIG_PACKAGE_getopt is not set
 # CONFIG_PACKAGE_hwclock is not set
 # CONFIG_PACKAGE_iconv is not set

openwrt-configs/19.07/config.lantiq.xrx200

@@ -2829,9 +2829,9 @@ CONFIG_PACKAGE_bspatch=y
 # CONFIG_PACKAGE_dmesg is not set
 # CONFIG_PACKAGE_dropbearconvert is not set
 # CONFIG_PACKAGE_flock is not set
-# CONFIG_PACKAGE_fritz-caldata is not set
+CONFIG_PACKAGE_fritz-caldata=y
 CONFIG_PACKAGE_fritz-tffs=y
-# CONFIG_PACKAGE_fritz-tffs-nand is not set
+CONFIG_PACKAGE_fritz-tffs-nand=y
 # CONFIG_PACKAGE_getopt is not set
 # CONFIG_PACKAGE_hwclock is not set
 # CONFIG_PACKAGE_iconv is not set

openwrt-configs/19.07/config.ramips.mt7621.generic

@@ -442,10 +442,10 @@ CONFIG_FEED_telephony=y
 #
 # Base system
 #
-CONFIG_PACKAGE_base-files=m
+CONFIG_PACKAGE_base-files=y
 CONFIG_PACKAGE_block-mount=y
 # CONFIG_PACKAGE_blockd is not set
-CONFIG_PACKAGE_busybox=m
+CONFIG_PACKAGE_busybox=y
 # CONFIG_BUSYBOX_CUSTOM is not set
 CONFIG_BUSYBOX_DEFAULT_HAVE_DOT_CONFIG=y
 # CONFIG_BUSYBOX_DEFAULT_DESKTOP is not set
@@ -1485,9 +1485,9 @@ CONFIG_BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
 # CONFIG_BUSYBOX_DEFAULT_FEATURE_KMSG_SYSLOG is not set
 # CONFIG_PACKAGE_ca-bundle is not set
 # CONFIG_PACKAGE_ca-certificates is not set
-CONFIG_PACKAGE_dnsmasq=m
+CONFIG_PACKAGE_dnsmasq=y
 # CONFIG_PACKAGE_dnsmasq-full is not set
-CONFIG_PACKAGE_dropbear=m
+CONFIG_PACKAGE_dropbear=y
 
 #
 # Configuration
@@ -1497,14 +1497,14 @@ CONFIG_DROPBEAR_CURVE25519=y
 # CONFIG_DROPBEAR_ZLIB is not set
 CONFIG_DROPBEAR_DBCLIENT=y
 # CONFIG_PACKAGE_ead is not set
-CONFIG_PACKAGE_firewall=m
-CONFIG_PACKAGE_fstools=m
+CONFIG_PACKAGE_firewall=y
+CONFIG_PACKAGE_fstools=y
 CONFIG_FSTOOLS_UBIFS_EXTROOT=y
 # CONFIG_FSTOOLS_OVL_MOUNT_FULL_ACCESS_TIME is not set
 # CONFIG_FSTOOLS_OVL_MOUNT_COMPRESS_ZLIB is not set
-CONFIG_PACKAGE_fwtool=m
-CONFIG_PACKAGE_getrandom=m
-CONFIG_PACKAGE_jsonfilter=m
+CONFIG_PACKAGE_fwtool=y
+CONFIG_PACKAGE_getrandom=y
+CONFIG_PACKAGE_jsonfilter=y
 # CONFIG_PACKAGE_libatomic is not set
 CONFIG_PACKAGE_libc=y
 CONFIG_PACKAGE_libgcc=y
@@ -1512,13 +1512,13 @@ CONFIG_PACKAGE_libgcc=y
 CONFIG_PACKAGE_libpthread=y
 CONFIG_PACKAGE_librt=y
 # CONFIG_PACKAGE_libstdcpp is not set
-CONFIG_PACKAGE_logd=m
-CONFIG_PACKAGE_mtd=m
-CONFIG_PACKAGE_netifd=m
+CONFIG_PACKAGE_logd=y
+CONFIG_PACKAGE_mtd=y
+CONFIG_PACKAGE_netifd=y
 # CONFIG_PACKAGE_om-watchdog is not set
-CONFIG_PACKAGE_openwrt-keyring=m
-CONFIG_PACKAGE_opkg=m
-CONFIG_PACKAGE_procd=m
+CONFIG_PACKAGE_openwrt-keyring=y
+CONFIG_PACKAGE_opkg=y
+CONFIG_PACKAGE_procd=y
 
 #
 # Configuration
@@ -1529,16 +1529,16 @@ CONFIG_PACKAGE_procd=m
 # CONFIG_PACKAGE_resolveip is not set
 # CONFIG_PACKAGE_rpcd is not set
 # CONFIG_PACKAGE_snapshot-tool is not set
-CONFIG_PACKAGE_swconfig=m
+CONFIG_PACKAGE_swconfig=y
 CONFIG_PACKAGE_ubox=y
 CONFIG_PACKAGE_ubus=y
 CONFIG_PACKAGE_ubusd=y
 # CONFIG_PACKAGE_ucert is not set
 # CONFIG_PACKAGE_ucert-full is not set
-CONFIG_PACKAGE_uci=m
-CONFIG_PACKAGE_urandom-seed=m
-CONFIG_PACKAGE_urngd=m
-CONFIG_PACKAGE_usign=m
+CONFIG_PACKAGE_uci=y
+CONFIG_PACKAGE_urandom-seed=y
+CONFIG_PACKAGE_urngd=y
+CONFIG_PACKAGE_usign=y
 # CONFIG_PACKAGE_wireless-tools is not set
 # CONFIG_PACKAGE_zram-swap is not set
 
@@ -1593,7 +1593,7 @@ CONFIG_PACKAGE_wshaper=y
 CONFIG_PACKAGE_ddmesh-base=y
 CONFIG_PACKAGE_ddmesh-extra-modules=m
 CONFIG_PACKAGE_tcpdump=y
-# CONFIG_PACKAGE_wireguard is not set
+CONFIG_PACKAGE_wireguard=y
 # CONFIG_PACKAGE_ddmesh-usb-lte is not set
 CONFIG_PACKAGE_ddmesh-usb-storage=y
 CONFIG_PACKAGE_ddmesh-wifi=y
@@ -1881,7 +1881,7 @@ CONFIG_PACKAGE_kmod-fs-vfat=y
 #
 # LED modules
 #
-# CONFIG_PACKAGE_kmod-leds-gpio is not set
+CONFIG_PACKAGE_kmod-leds-gpio=y
 # CONFIG_PACKAGE_kmod-leds-pca963x is not set
 # CONFIG_PACKAGE_kmod-ledtrig-default-on is not set
 # CONFIG_PACKAGE_kmod-ledtrig-gpio is not set
@@ -1940,7 +1940,7 @@ CONFIG_PACKAGE_kmod-nls-utf8=y
 # CONFIG_PACKAGE_kmod-ipt-checksum is not set
 # CONFIG_PACKAGE_kmod-ipt-cluster is not set
 # CONFIG_PACKAGE_kmod-ipt-clusterip is not set
-CONFIG_PACKAGE_kmod-ipt-conntrack=m
+CONFIG_PACKAGE_kmod-ipt-conntrack=y
 # CONFIG_PACKAGE_kmod-ipt-conntrack-extra is not set
 # CONFIG_PACKAGE_kmod-ipt-conntrack-label is not set
 CONFIG_PACKAGE_kmod-ipt-core=y
@@ -1953,7 +1953,7 @@ CONFIG_PACKAGE_kmod-ipt-core=y
 # CONFIG_PACKAGE_kmod-ipt-ipsec is not set
 # CONFIG_PACKAGE_kmod-ipt-ipset is not set
 # CONFIG_PACKAGE_kmod-ipt-led is not set
-CONFIG_PACKAGE_kmod-ipt-nat=m
+CONFIG_PACKAGE_kmod-ipt-nat=y
 # CONFIG_PACKAGE_kmod-ipt-nat-extra is not set
 # CONFIG_PACKAGE_kmod-ipt-nflog is not set
 # CONFIG_PACKAGE_kmod-ipt-nfqueue is not set
@@ -1965,12 +1965,12 @@ CONFIG_PACKAGE_kmod-ipt-nat=m
 # CONFIG_PACKAGE_kmod-ipt-tproxy is not set
 # CONFIG_PACKAGE_kmod-ipt-u32 is not set
 # CONFIG_PACKAGE_kmod-ipt-ulog is not set
-CONFIG_PACKAGE_kmod-nf-conntrack=m
+CONFIG_PACKAGE_kmod-nf-conntrack=y
 # CONFIG_PACKAGE_kmod-nf-conntrack-netlink is not set
 # CONFIG_PACKAGE_kmod-nf-flow is not set
 CONFIG_PACKAGE_kmod-nf-ipt=y
 # CONFIG_PACKAGE_kmod-nf-ipt6 is not set
-CONFIG_PACKAGE_kmod-nf-nat=m
+CONFIG_PACKAGE_kmod-nf-nat=y
 # CONFIG_PACKAGE_kmod-nf-nathelper is not set
 # CONFIG_PACKAGE_kmod-nf-nathelper-extra is not set
 CONFIG_PACKAGE_kmod-nf-reject=y
@@ -2078,9 +2078,10 @@ CONFIG_PACKAGE_kmod-sched-core=y
 # CONFIG_PACKAGE_kmod-tcp-bbr is not set
 # CONFIG_PACKAGE_kmod-trelay is not set
 CONFIG_PACKAGE_kmod-tun=y
+CONFIG_PACKAGE_kmod-udptunnel4=y
 # CONFIG_PACKAGE_kmod-veth is not set
 # CONFIG_PACKAGE_kmod-vxlan is not set
-# CONFIG_PACKAGE_kmod-wireguard is not set
+CONFIG_PACKAGE_kmod-wireguard=y
 
 #
 # Other modules
@@ -2190,7 +2191,7 @@ CONFIG_PACKAGE_kmod-usb-storage=y
 # CONFIG_PACKAGE_kmod-usb-yealink is not set
 CONFIG_PACKAGE_kmod-usb2=y
 # CONFIG_PACKAGE_kmod-usb2-pci is not set
-CONFIG_PACKAGE_kmod-usb3=m
+# CONFIG_PACKAGE_kmod-usb3 is not set
 # CONFIG_PACKAGE_kmod-usbip is not set
 # CONFIG_PACKAGE_kmod-usbip-client is not set
 # CONFIG_PACKAGE_kmod-usbip-server is not set
@@ -2394,7 +2395,7 @@ CONFIG_PACKAGE_libjson-c=y
 # CONFIG_PACKAGE_libltdl is not set
 # CONFIG_PACKAGE_liblua is not set
 CONFIG_PACKAGE_liblzo=y
-# CONFIG_PACKAGE_libmnl is not set
+CONFIG_PACKAGE_libmnl=y
 # CONFIG_PACKAGE_libmount is not set
 # CONFIG_PACKAGE_libncurses is not set
 # CONFIG_PACKAGE_libnetfilter-conntrack is not set
@@ -2438,7 +2439,7 @@ CONFIG_PACKAGE_libubus=y
 # CONFIG_PACKAGE_libubus-lua is not set
 CONFIG_PACKAGE_libuci=y
 # CONFIG_PACKAGE_libuci-lua is not set
-CONFIG_PACKAGE_libuclient=m
+CONFIG_PACKAGE_libuclient=y
 # CONFIG_PACKAGE_libunistring is not set
 # CONFIG_PACKAGE_libunwind is not set
 # CONFIG_PACKAGE_libusb-1.0 is not set
@@ -2537,7 +2538,7 @@ CONFIG_PACKAGE_iptables=y
 # OpenLDAP
 #
 # CONFIG_PACKAGE_libopenldap is not set
-# CONFIG_OPENLDAP_DEBUG is not set
+CONFIG_OPENLDAP_DEBUG=y
 # CONFIG_OPENLDAP_CRYPT is not set
 # CONFIG_OPENLDAP_MONITOR is not set
 # CONFIG_OPENLDAP_DB47 is not set
@@ -2553,7 +2554,7 @@ CONFIG_PACKAGE_iptables=y
 # CONFIG_PACKAGE_igmpproxy is not set
 # CONFIG_PACKAGE_ip-bridge is not set
 # CONFIG_PACKAGE_ip-full is not set
-# CONFIG_PACKAGE_ip-tiny is not set
+CONFIG_PACKAGE_ip-tiny=y
 # CONFIG_PACKAGE_lldpd is not set
 # CONFIG_PACKAGE_nstat is not set
 # CONFIG_PACKAGE_rdma is not set
@@ -2635,7 +2636,7 @@ CONFIG_OPENVPN_mbedtls_ENABLE_PF=y
 CONFIG_OPENVPN_mbedtls_ENABLE_SMALL=y
 # CONFIG_PACKAGE_openvpn-nossl is not set
 # CONFIG_PACKAGE_openvpn-openssl is not set
-# CONFIG_PACKAGE_wireguard-tools is not set
+CONFIG_PACKAGE_wireguard-tools=y
 
 #
 # WWAN
@@ -2697,7 +2698,7 @@ CONFIG_PACKAGE_iw=y
 # CONFIG_PACKAGE_snmptrapd is not set
 # CONFIG_PACKAGE_soloscli is not set
 # CONFIG_PACKAGE_tcpdump-mini is not set
-CONFIG_PACKAGE_uclient-fetch=m
+CONFIG_PACKAGE_uclient-fetch=y
 # CONFIG_PACKAGE_umbim is not set
 # CONFIG_PACKAGE_umdns is not set
 # CONFIG_PACKAGE_vti is not set
@@ -2817,7 +2818,7 @@ CONFIG_PACKAGE_px5g-mbedtls=y
 # CONFIG_PACKAGE_iconv is not set
 # CONFIG_PACKAGE_iwcap is not set
 CONFIG_PACKAGE_iwinfo=y
-CONFIG_PACKAGE_jshn=m
+CONFIG_PACKAGE_jshn=y
 # CONFIG_PACKAGE_kmod is not set
 CONFIG_PACKAGE_libjson-script=y
 # CONFIG_PACKAGE_libxml2-utils is not set
@@ -2842,7 +2843,7 @@ CONFIG_PACKAGE_libjson-script=y
 CONFIG_STRACE_NONE=y
 # CONFIG_STRACE_LIBDW is not set
 # CONFIG_STRACE_LIBUNWIND is not set
-CONFIG_PACKAGE_ubi-utils=m
+CONFIG_PACKAGE_ubi-utils=y
 # CONFIG_PACKAGE_ugps is not set
 # CONFIG_PACKAGE_unshare is not set
 # CONFIG_PACKAGE_usb-modeswitch is not set

openwrt-patches-target/19.07/lantiq-0900-rollback.patch

---- 1	2019-10-02 22:12:39.998865879 +0200
+--- target/linux/lantiq/patches-4.14/0900-rollback.patch	2019-08-22 09:04:06.275497231 +0200
 +++ target/linux/lantiq/patches-4.14/0900-rollback.patch	2019-08-22 09:04:06.275497231 +0200
 @@ -0,0 +1,14 @@
 +--- a/arch/mips/lantiq/irq.c	2019-08-09 17:53:37.000000000 +0200

openwrt-patches-target/19.07/lantiq-0901-add-icu-smp-support.patch

---- 1	2019-10-02 22:12:39.998865879 +0200
+--- target/linux/lantiq/patches-4.14/0901-add-icu-smp-support.patch	2019-08-01 13:38:23.386092302 +0200
 +++ target/linux/lantiq/patches-4.14/0901-add-icu-smp-support.patch	2019-08-01 13:38:23.386092302 +0200
 @@ -0,0 +1,436 @@
 +--- a/arch/mips/lantiq/irq.c	2019-03-10 20:44:58.755134326 +0100

openwrt-patches-target/19.07/lantiq-0902-backport-vanilla-eth-driver.patch

---- 1	2019-10-02 22:12:39.998865879 +0200
+--- target/linux/lantiq/patches-4.14/0902-backport-vanilla-eth-driver.patch	2019-08-01 13:38:55.750166125 +0200
 +++ target/linux/lantiq/patches-4.14/0902-backport-vanilla-eth-driver.patch	2019-08-01 13:38:55.750166125 +0200
 @@ -0,0 +1,1688 @@
 +--- a/drivers/net/ethernet/lantiq_xrx200.c	2019-03-10 20:44:58.797133801 +0100

openwrt-patches/special/package-qemu-ga-buildfix.patch

---- feeds/packages/utils/qemu/Makefile	2019-10-02 15:18:02.441112167 +0200
-+++ feeds/packages/utils/qemu/Makefile	2019-10-02 15:18:07.977006015 +0200
-@@ -55,7 +55,7 @@
- 
- define Package/qemu-ga/install
- 	$(INSTALL_DIR) $(1)/usr/bin
--	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qemu-ga $(1)/usr/bin
-+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qemu-ga $(1)/usr/bin
- 	$(INSTALL_DIR) $(1)/etc/init.d
- 	$(INSTALL_BIN) ./files/qemu-ga.init $(1)/etc/init.d/qemu-ga
- 	$(INSTALL_DIR) $(1)/etc/hotplug.d/virtio-ports