patches/packages/packages/0004-perl-drop-110-always_use_miniperl.patch.patch

+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Fri, 25 Apr 2025 12:35:23 +0200
+Subject: perl: drop 110-always_use_miniperl.patch
+
+The patch was introduced in commit 4c57844f0f04 ("lang/perl: Add hack to
+make perl always use miniperl during build"), but it is not actually
+necessary. By setting $perl to a non-empty value (using 'perl' as is
+common on desktop distros), the logic works as intended and selects the
+correct perl binary for host and target builds.
+
+As miniperl just symlinks to host perl for target builds, the main
+effect of this change is not unconditionally passing `-Ilib -I.`
+anymore. This seems like a good thing; host libraries should be used
+with host perl by default.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/lang/perl/files/base.config b/lang/perl/files/base.config
+index 67232b6d83e70505e7e85ad6893a2661f4571f7f..7d8b88b200f589b0efad7b301d26c6f9b77dfb33 100644
+--- a/lang/perl/files/base.config
++++ b/lang/perl/files/base.config
+@@ -864,7 +864,7 @@ package='perl5'
+ pager='/usr/bin/less'
+ passcat='cat /etc/passwd'
+ path_sep=':'
+-perl=''
++perl='perl'
+ perl5=''
+ perl_patchlevel=''
+ perl_static_inline='static __inline__'
+diff --git a/lang/perl/patches/110-always_use_miniperl.patch b/lang/perl/patches/110-always_use_miniperl.patch
+deleted file mode 100644
+index 806a31256b2007ee5f2c36d75261fac0d176cc21..0000000000000000000000000000000000000000
+--- a/lang/perl/patches/110-always_use_miniperl.patch
++++ /dev/null
+@@ -1,27 +0,0 @@
+---- a/Makefile.SH
+-+++ b/Makefile.SH
+-@@ -360,22 +360,11 @@ PERL_EXE_LDFLAGS=$exeldflags
+- 	;;
+- esac
+- 
+--case "$usecrosscompile$perl" in
+--define?*)
+--	$spitshell >>$Makefile <<!GROK!THIS!
+--# Macros to invoke a copy of our fully operational perl during the build.
+--PERL_EXE = perl\$(EXE_EXT)
+--RUN_PERL = \$(LDLIBPTH) \$(RUN) $perl\$(EXE_EXT)
+--!GROK!THIS!
+--	;;
+--*)
+--	$spitshell >>$Makefile <<!GROK!THIS!
+-+$spitshell >>$Makefile <<!GROK!THIS!
+- # Macros to invoke a copy of our fully operational perl during the build.
+- PERL_EXE = perl\$(EXE_EXT)
+--RUN_PERL = \$(LDLIBPTH) \$(RUN) ./perl\$(EXE_EXT) -Ilib -I.
+-+RUN_PERL = \$(LDLIBPTH) \$(RUN) ./miniperl\$(EXE_EXT) -Ilib -I.
+- !GROK!THIS!
+--	;;
+--esac
+- 
+- $spitshell >>$Makefile <<!GROK!THIS!
+- # Macros to run our tests
+diff --git a/lang/perl/patches/900-use-rm-force.patch b/lang/perl/patches/900-use-rm-force.patch
+index 9e44f5402f184445dcf4e9c75d96d2e412e5c4e0..baff506f6427f0b16712c252b0159ad80db20243 100644
+--- a/lang/perl/patches/900-use-rm-force.patch
++++ b/lang/perl/patches/900-use-rm-force.patch
+@@ -8,7 +8,7 @@
+  ranlib = $ranlib
+  ECHO = $echo
+  
+-@@ -791,7 +792,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
++@@ -802,7 +803,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
+  	./generate_uudmap$(HOST_EXE_EXT) $(generated_headers)
+  
+  generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
+@@ -17,7 +17,7 @@
+  	$(LNS) $(HOST_GENERATE) generate_uudmap$(HOST_EXE_EXT)
+  
+  !NO!SUBS!
+-@@ -896,26 +897,26 @@ mydtrace.h: $(DTRACE_H)
++@@ -907,26 +908,26 @@ mydtrace.h: $(DTRACE_H)
+  	define)
+  		$spitshell >>$Makefile <<'!NO!SUBS!'
+  $(DTRACE_MINI_O): perldtrace.d $(miniperl_objs_nodt)
+@@ -48,7 +48,7 @@
+  
+  !NO!SUBS!
+  		;;
+-@@ -926,13 +927,13 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
++@@ -937,13 +938,13 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
+  	case "$useshrplib" in
+  	true)
+  		$spitshell >>$Makefile <<'!NO!SUBS!'
+@@ -64,7 +64,7 @@
+  	mv $@ libperl$(OBJ_EXT)
+  	$(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
+  !NO!SUBS!
+-@@ -941,7 +942,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
++@@ -952,7 +953,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
+  		;;
+  	*)
+  		$spitshell >>$Makefile <<'!NO!SUBS!'
+@@ -73,7 +73,7 @@
+  	$(AR) rc $(LIBPERL) $(perllib_objs) $(DYNALOADER)
+  	@$(ranlib) $(LIBPERL)
+  !NO!SUBS!
+-@@ -975,7 +976,7 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
++@@ -986,7 +987,7 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
+  	amigaos*)
+  		$spitshell >>$Makefile <<'!NO!SUBS!'
+  lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
+@@ -82,7 +82,7 @@
+  	$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
+  	    $(miniperl_objs) $(libs)
+  #	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+-@@ -997,7 +998,7 @@ NAMESPACEFLAGS = -force_flat_namespace
++@@ -1008,7 +1009,7 @@ NAMESPACEFLAGS = -force_flat_namespace
+  		esac
+  		$spitshell >>$Makefile <<'!NO!SUBS!'
+  lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
+@@ -91,7 +91,7 @@
+  	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
+  	    $(miniperl_objs) $(libs)
+  	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+-@@ -1008,8 +1009,8 @@ lib/buildcustomize.pl: $& $(miniperl_obj
++@@ -1019,8 +1020,8 @@ lib/buildcustomize.pl: $& $(miniperl_obj
+  		if test "X$hostperl" != X; then
+  			$spitshell >>$Makefile <<!GROK!THIS!
+  lib/buildcustomize.pl: \$& \$(miniperl_dep) write_buildcustomize.pl
+@@ -102,7 +102,7 @@
+  	\$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
+  	\$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+  	\$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
+-@@ -1017,7 +1018,7 @@ lib/buildcustomize.pl: \$& \$(miniperl_d
++@@ -1028,7 +1029,7 @@ lib/buildcustomize.pl: \$& \$(miniperl_d
+  		else
+  			$spitshell >>$Makefile <<'!NO!SUBS!'
+  lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl
+@@ -111,7 +111,7 @@
+  	$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
+  	    $(miniperl_objs) $(libs)
+  	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
+-@@ -1030,7 +1031,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep
++@@ -1041,7 +1042,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep
+  	$spitshell >>$Makefile <<'!NO!SUBS!'
+  
+  $(PERL_EXE): $& $(perlmain_dep) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) write_buildcustomize.pl
+@@ -120,7 +120,7 @@
+  !NO!SUBS!
+  
+          case "$osname" in
+-@@ -1130,8 +1131,8 @@ pod/perl5400delta.pod: pod/perldelta.pod
++@@ -1141,8 +1142,8 @@ pod/perl5400delta.pod: pod/perldelta.pod
+  	$(LNS) perldelta.pod pod/perl5400delta.pod
+  
+  extra.pods: $(MINIPERL_EXE)
+@@ -131,7 +131,7 @@
+  	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
+  	    nx=`echo $$x | sed -e "s/README\.//"`; \
+  	    $(LNS) ../$$x "pod/perl"$$nx".pod" ; \
+-@@ -1330,11 +1331,11 @@ realclean:	_realcleaner _mopup
++@@ -1341,11 +1342,11 @@ realclean:	_realcleaner _mopup
+  	@echo "Note that '$(MAKE) realclean' does not delete config.sh or Policy.sh"
+  
+  _clobber:
+@@ -148,7 +148,7 @@
+  
+  clobber:	_realcleaner _mopup _clobber
+  
+-@@ -1342,24 +1343,24 @@ distclean:	clobber
++@@ -1353,24 +1354,24 @@ distclean:	clobber
+  
+  # Like distclean but also removes emacs backups and *.orig.
+  veryclean:	_verycleaner _mopup _clobber
+@@ -184,7 +184,7 @@
+  	-cd pod; $(LDLIBPTH) $(MAKE) $(CLEAN)
+  	-cd utils; $(LDLIBPTH) $(MAKE) $(CLEAN)
+  	-@if test -f $(MINIPERL_EXE) ; then \
+-@@ -1369,8 +1370,8 @@ _cleaner1:
++@@ -1380,8 +1381,8 @@ _cleaner1:
+  	else \
+  	sh $(CLEAN).sh ; \
+  	fi
+@@ -195,7 +195,7 @@
+  
+  # Dear POSIX, thanks for making the default to xargs to be
+  # run once if nothing is passed in. It is such a great help.
+-@@ -1385,24 +1386,24 @@ _cleaner1:
++@@ -1396,24 +1397,24 @@ _cleaner1:
+  # Add new rules before that line - the next line (rm -f so_locations ...) is
+  # used as a placeholder by a regen script.
+  _cleaner2:
+@@ -237,7 +237,7 @@
+  	-rmdir lib/version lib/threads lib/inc/ExtUtils lib/inc lib/encoding
+  	-rmdir lib/autodie/exception lib/autodie/Scope lib/autodie lib/XS
+  	-rmdir lib/Win32API lib/VMS lib/Unicode/Collate/Locale
+-@@ -1459,11 +1460,11 @@ _realcleaner:
++@@ -1470,11 +1471,11 @@ _realcleaner:
+  _verycleaner:
+  	@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=veryclean
+  	@$(LDLIBPTH) $(MAKE) _cleaner2
+@@ -251,7 +251,7 @@
+  	lint $(lintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(c)
+  
+  cscopeflags = -Rb  # Recursive, build-only.
+-@@ -1524,7 +1525,7 @@ case "$targethost" in
++@@ -1535,7 +1536,7 @@ case "$targethost" in
+  '') $spitshell >>$Makefile <<'!NO!SUBS!'
+  test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
+  	$(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods) common_build
+@@ -260,7 +260,7 @@
+  
+  !NO!SUBS!
+  ;;
+-@@ -1574,7 +1575,7 @@ test_prep test-prep: test_prep_pre \$(MI
++@@ -1585,7 +1586,7 @@ test_prep test-prep: test_prep_pre \$(MI
+  	$to config.sh
+  # --- For lib/diagnostics.t with -Duseshrplib
+  	$to \$(PERL_EXE)
+@@ -269,7 +269,7 @@
+  	$to t/\$(PERL_EXE)
+  
+  !GROK!THIS!
+-@@ -1592,7 +1593,7 @@ else
++@@ -1603,7 +1604,7 @@ else
+  $spitshell >>$Makefile <<'!NO!SUBS!'
+  test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
+  	$(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
+@@ -278,7 +278,7 @@
+  !NO!SUBS!
+  fi
+  
+-@@ -1648,7 +1649,7 @@ minitest_prep: $(MINIPERL_EXE)
++@@ -1659,7 +1660,7 @@ minitest_prep: $(MINIPERL_EXE)
+  	@echo "You may see some irrelevant test failures if you have been unable"
+  	@echo "to build lib/Config.pm, or the Unicode data files."
+  	@echo " "
+diff --git a/lang/perl/patches/920-Revert-perl-127606-adjust-dependency-paths-on-instal.patch b/lang/perl/patches/920-Revert-perl-127606-adjust-dependency-paths-on-instal.patch
+index e9e5688e475e810f45acbda5cd579c65e484b8b7..6436a8ea027f46a8ce1c41b13323b625cc51eb4d 100644
+--- a/lang/perl/patches/920-Revert-perl-127606-adjust-dependency-paths-on-instal.patch
++++ b/lang/perl/patches/920-Revert-perl-127606-adjust-dependency-paths-on-instal.patch
+@@ -42,10 +42,10 @@ Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
+ -	;;
+ -esac
+ -
+- $spitshell >>$Makefile <<!GROK!THIS!
+- # Macros to invoke a copy of our fully operational perl during the build.
+- PERL_EXE = perl\$(EXE_EXT)
+-@@ -1045,20 +1029,6 @@ $(PERL_EXE): $& $(perlmain_dep) $(LIBPER
++ case "$usecrosscompile$perl" in
++ define?*)
++ 	$spitshell >>$Makefile <<!GROK!THIS!
++@@ -1056,20 +1040,6 @@ $(PERL_EXE): $& $(perlmain_dep) $(LIBPER
+  	$(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(LLIBPERL) $(static_ext) `cat ext.libs` $(libs)
+  !NO!SUBS!
+          ;;

patches/packages/packages/0005-perl-fix-parallel-build-race-condition-in-target-build.patch

+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Sat, 26 Apr 2025 22:37:16 +0200
+Subject: perl: fix parallel build race condition in target build
+
+We have received reports of builds of perl occasionally failing when
+building with many parallel jobs, with a log like the following:
+
+    LD_LIBRARY_PATH=[...]/perl/perl-5.40.0 ./miniperl -Ilib make_ext.pl \
+        dist/constant/pm_to_blib  MAKE="make" LIBPERL_A=libperl.so
+    File/Path.pm did not return a true value at [...]/hostpkg/usr/lib/perl5/5.40.0/ExtUtils/MakeMaker.pm line 13.
+    BEGIN failed--compilation aborted at [...]/hostpkg/usr/lib/perl5/5.40.0/ExtUtils/MakeMaker.pm line 13.
+    Compilation failed in require at Makefile.PL line 3.
+    BEGIN failed--compilation aborted at Makefile.PL line 3.
+    Unsuccessful Makefile.PL(dist/constant): code=65280 at make_ext.pl line 532.
+
+The failing extension (dist/constant in the above log) would differ
+between runs.
+
+The cause of the issue is the `-Ilib` in the command line of miniperl.
+In the host build, `./miniperl -I lib` will use the following include
+path:
+
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/AutoLoader/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/Carp/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/PathTools
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/PathTools/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/ExtUtils-Install/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/ExtUtils-MakeMaker/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/ExtUtils-Manifest/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/File-Path/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/ext/re
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/Term-ReadLine/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/Exporter/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/ext/File-Find/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/Text-Tabs/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/dist/constant/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/version/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/Getopt-Long/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/Text-ParseWords/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/cpan/ExtUtils-PL2Bat/lib
+    [..]/build_dir/hostpkg/perl/perl-5.40.0/lib
+    .
+
+Various dependencies of the extension build scripts (Makefile.PL) -
+including File-Path, which failed to be loaded in the error log - are
+included in the path by buildcustomize.pl, as these extensions are only
+installed to `lib` as the build proceeds.
+
+However, in a target build, miniperl is just a symlink to the previously
+built host perl. As the host perl does not implicitly load
+`buildcustomize.pl`, we get the following include path for
+`./miniperl -Ilib`:
+
+    lib
+    [..]/staging_dir/hostpkg/usr/lib/perl5/site_perl/5.40.0/x86_64-linux
+    [..]/staging_dir/hostpkg/usr/lib/perl5/site_perl/5.40.0
+    [..]/staging_dir/hostpkg/usr/lib/perl5/5.40.0/x86_64-linux
+    [..]/staging_dir/hostpkg/usr/lib/perl5/5.40.0
+
+The host perl's install location is used as the default include path
+which provides File-Path etc. for the target build; however, as more
+and more libraries get installed into `lib` during the extension build,
+they may get loaded from there instead, as `lib` is at the beginning of
+the include path. When multiple extensions are built in parallel, a
+Makefile.PL may attempt to load File/Path from `lib` after the file has
+been created, but before its contents have been written fully, resulting
+in the build to fail.
+
+In fact, we should not load anything from `lib` during the target build,
+as it is the staging directory for the target, including native
+extensions built for the target architecture - with one exception: The
+build scripts expect to find target information in the `Config` module,
+so simply removing `lib` from the include path completely would break
+the build.
+
+Solve the issue by creating an alternative lib directory `lib_build`,
+symlinking `Config.pm` and its dependencies in it, and replacing the
+`-Ilib` argument with `-Ilib_build` using a wrapper script around the
+host perl executable. This is similar to the approach seen in perl's own
+obsolete/broken cross compile scripts (`Cross/Makefile`).
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/lang/perl/Makefile b/lang/perl/Makefile
+index 6a6dd5ea86798e7e95e3657a94cca829dbd0924b..6ad27818e17c211abc1530eb0d1b1e7c1238bf28 100644
+--- a/lang/perl/Makefile
++++ b/lang/perl/Makefile
+@@ -92,6 +92,21 @@ endef
+ 
+ # Target perl
+ define Build/Configure
++	# We don't want to pass -Ilib to host perl in the target build (as lib
++	# contains the target libraries, and files may currently be written
++	# while being imported in parallel builds). We do however need the
++	# target versions of the Config modules at the beginning of the include
++	# path for the build scripts' use.
++	#
++	# Create an alternative lib_build directory that will be added to the
++	# include path instead of lib (using hostperl-wrapper), containing only
++	# the config modules.
++	$(INSTALL_DIR) $(PKG_BUILD_DIR)/lib_build
++	ln -sf ../lib/Config.pm ../lib/Config_heavy.pl ../lib/Config_git.pl $(PKG_BUILD_DIR)/lib_build/
++
++	install -m0755 files/hostperl-wrapper $(PKG_BUILD_DIR)/hostperl-wrapper
++	sed -i "s'@HOST_PERL@'$(HOST_PERL_PREFIX)/bin/perl'g" $(PKG_BUILD_DIR)/hostperl-wrapper
++
+ 	$(PERL_CMD) files/perlconfig.pl -Dowrt:target_cc='$(TARGET_CC)' \
+ 	                                -Dowrt:gccversion=$(CONFIG_GCC_VERSION) \
+ 	                                -Dowrt:target_cross='$(TARGET_CROSS)' \
+diff --git a/lang/perl/files/base.config b/lang/perl/files/base.config
+index 7d8b88b200f589b0efad7b301d26c6f9b77dfb33..1cadfc10ac20c3b2bb05bed3c2cc8e946ba24eef 100644
+--- a/lang/perl/files/base.config
++++ b/lang/perl/files/base.config
+@@ -650,7 +650,7 @@ hint='recommended'
+ hostcat='cat /etc/hosts'
+ hostgenerate="$owrt:host_perl_prefix/bin/generate_uudmap"
+ hostosname=''
+-hostperl="$owrt:host_perl_prefix/bin/perl"
++hostperl="./hostperl-wrapper"
+ html1dir=' '
+ html1direxp=''
+ html3dir=' '
+diff --git a/lang/perl/files/hostperl-wrapper b/lang/perl/files/hostperl-wrapper
+new file mode 100644
+index 0000000000000000000000000000000000000000..e31ef1cf8fe37a7a90ee9dd7cc60d3ca947e7600
+--- /dev/null
++++ b/lang/perl/files/hostperl-wrapper
+@@ -0,0 +1,14 @@
++#!@HOST_PERL@
++
++foreach (@ARGV) {
++	# Stop parsing options if we encounter a non-option argument or --
++	last if $_ eq '--' || $_ !~ m/^-/;
++
++	# Modify first option of the form -Ilib, -I../lib, ... to refer to lib_build instead
++	if ($_ =~ m@-I(.*/)?lib@) {
++		$_ .= '_build';
++		last;
++	}
++}
++
++exec '@HOST_PERL@', @ARGV

patches/packages/routing/0002-batman-adv-Introduce-no-noflood-mark.patch

+From: Linus Lüssing <linus.luessing@c0d3.blue>
+Date: Sun, 10 Nov 2024 19:34:26 +0100
+Subject: batman-adv: Introduce no noflood mark
+
+This mark prevents a multicast packet being flooded through the whole
+mesh. The advantage of marking certain multicast packets via e.g.
+ebtables instead of dropping is then the following:
+
+This allows an administrator to let specific multicast packets pass as
+long as they are forwarded to a limited number of nodes only and are
+therefore creating no burdon to unrelated nodes.
+
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+
+diff --git a/batman-adv/patches/2002-batman-adv-Introduce-no-noflood-mark.patch b/batman-adv/patches/2002-batman-adv-Introduce-no-noflood-mark.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..6058bff5bb4d07c78a82f59b47213a52b04d6a1e
+--- /dev/null
++++ b/batman-adv/patches/2002-batman-adv-Introduce-no-noflood-mark.patch
+@@ -0,0 +1,137 @@
++From: Linus Lüssing <linus.luessing@c0d3.blue>
++Date: Sat, 31 Mar 2018 03:36:19 +0200
++Subject: batman-adv: Introduce no noflood mark
++
++This mark prevents a multicast packet being flooded through the whole
++mesh. The advantage of marking certain multicast packets via e.g.
++ebtables instead of dropping is then the following:
++
++This allows an administrator to let specific multicast packets pass as
++long as they are forwarded to a limited number of nodes only and are
++therefore creating no burdon to unrelated nodes.
++
++Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
++
++--- a/include/uapi/linux/batman_adv.h
+++++ b/include/uapi/linux/batman_adv.h
++@@ -481,6 +481,18 @@ enum batadv_nl_attrs {
++ 	 */
++ 	BATADV_ATTR_MULTICAST_FANOUT,
++ 
+++	/**
+++	 * @BATADV_ATTR_NOFLOOD_MARK: the noflood mark which allows to tag
+++	 *  frames which should never be broadcast flooded through the mesh.
+++	 */
+++	BATADV_ATTR_NOFLOOD_MARK,
+++
+++	/**
+++	 * @BATADV_ATTR_NOFLOOD_MASK: the noflood (bit)mask which allows to tag
+++	 *  frames which should never be broadcast flooded through the mesh.
+++	 */
+++	BATADV_ATTR_NOFLOOD_MASK,
+++
++ 	/* add attributes above here, update the policy in netlink.c */
++ 
++ 	/**
++--- a/net/batman-adv/netlink.c
+++++ b/net/batman-adv/netlink.c
++@@ -133,6 +133,8 @@ static const struct nla_policy batadv_ne
++ 	[BATADV_ATTR_AP_ISOLATION_ENABLED]	= { .type = NLA_U8 },
++ 	[BATADV_ATTR_ISOLATION_MARK]		= { .type = NLA_U32 },
++ 	[BATADV_ATTR_ISOLATION_MASK]		= { .type = NLA_U32 },
+++	[BATADV_ATTR_NOFLOOD_MARK]		= { .type = NLA_U32 },
+++	[BATADV_ATTR_NOFLOOD_MASK]		= { .type = NLA_U32 },
++ 	[BATADV_ATTR_BONDING_ENABLED]		= { .type = NLA_U8 },
++ 	[BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED]	= { .type = NLA_U8 },
++ 	[BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED]	= { .type = NLA_U8 },
++@@ -285,6 +287,14 @@ static int batadv_netlink_mesh_fill(stru
++ 			bat_priv->isolation_mark_mask))
++ 		goto nla_put_failure;
++ 
+++	if (nla_put_u32(msg, BATADV_ATTR_NOFLOOD_MARK,
+++			bat_priv->noflood_mark))
+++		goto nla_put_failure;
+++
+++	if (nla_put_u32(msg, BATADV_ATTR_NOFLOOD_MASK,
+++			bat_priv->noflood_mark_mask))
+++		goto nla_put_failure;
+++
++ 	if (nla_put_u8(msg, BATADV_ATTR_BONDING_ENABLED,
++ 		       !!atomic_read(&bat_priv->bonding)))
++ 		goto nla_put_failure;
++@@ -463,6 +473,18 @@ static int batadv_netlink_set_mesh(struc
++ 		bat_priv->isolation_mark_mask = nla_get_u32(attr);
++ 	}
++ 
+++	if (info->attrs[BATADV_ATTR_NOFLOOD_MARK]) {
+++		attr = info->attrs[BATADV_ATTR_NOFLOOD_MARK];
+++
+++		bat_priv->noflood_mark = nla_get_u32(attr);
+++	}
+++
+++	if (info->attrs[BATADV_ATTR_NOFLOOD_MASK]) {
+++		attr = info->attrs[BATADV_ATTR_NOFLOOD_MASK];
+++
+++		bat_priv->noflood_mark_mask = nla_get_u32(attr);
+++	}
+++
++ 	if (info->attrs[BATADV_ATTR_BONDING_ENABLED]) {
++ 		attr = info->attrs[BATADV_ATTR_BONDING_ENABLED];
++ 
++--- a/net/batman-adv/soft-interface.c
+++++ b/net/batman-adv/soft-interface.c
++@@ -177,6 +177,23 @@ static void batadv_interface_set_rx_mode
++ {
++ }
++ 
+++/**
+++ * batadv_send_skb_has_noflood_mark() - check if packet has a noflood mark
+++ * @bat_priv: the bat priv with all the soft interface information
+++ * @skb: the packet to check
+++ *
+++ * Return: True if the skb's mark matches a configured noflood mark and
+++ * noflood mark mask. False otherwise.
+++ */
+++static bool
+++batadv_skb_has_noflood_mark(struct batadv_priv *bat_priv, struct sk_buff *skb)
+++{
+++	u32 match_mark = skb->mark & bat_priv->noflood_mark_mask;
+++
+++	return bat_priv->noflood_mark_mask &&
+++	       match_mark == bat_priv->noflood_mark;
+++}
+++
++ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,
++ 				       struct net_device *soft_iface)
++ {
++@@ -333,6 +350,9 @@ send:
++ 		if (batadv_dat_snoop_outgoing_arp_request(bat_priv, skb))
++ 			brd_delay = msecs_to_jiffies(ARP_REQ_DELAY);
++ 
+++		if (batadv_skb_has_noflood_mark(bat_priv, skb))
+++			goto dropped;
+++
++ 		if (batadv_skb_head_push(skb, sizeof(*bcast_packet)) < 0)
++ 			goto dropped;
++ 
++--- a/net/batman-adv/types.h
+++++ b/net/batman-adv/types.h
++@@ -1711,6 +1711,18 @@ struct batadv_priv {
++ 	 */
++ 	u32 isolation_mark_mask;
++ 
+++	/**
+++	 * @noflood_mark: the skb->mark value used to allow directed targeting
+++	 *  only
+++	 */
+++	u32 noflood_mark;
+++
+++	/**
+++	 * @noflood_mark_mask: bitmask identifying the bits in skb->mark to be
+++	 *  used for the noflood mark
+++	 */
+++	u32 noflood_mark_mask;
+++
++ 	/** @bcast_seqno: last sent broadcast packet sequence number */
++ 	atomic_t bcast_seqno;
++ 

patches/packages/routing/0003-batctl-Add-noflood_mark-command.patch

+From: Linus Lüssing <linus.luessing@c0d3.blue>
+Date: Sun, 10 Nov 2024 19:35:52 +0100
+Subject: batctl: Add noflood_mark command
+
+Adds support for the new 'noflood_mark' setting in batman-adv.
+
+Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
+
+diff --git a/batctl/patches/2002-batctl-Add-noflood_mark-command.patch b/batctl/patches/2002-batctl-Add-noflood_mark-command.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..d4498603785a21a71951a6195cd96661be44d685
+--- /dev/null
++++ b/batctl/patches/2002-batctl-Add-noflood_mark-command.patch
+@@ -0,0 +1,217 @@
++From 12884631753aa24d9e36c5d65950320ecab61384 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
++Date: Fri, 26 Apr 2019 19:27:38 +0200
++Subject: [PATCH] batctl: Add noflood_mark command
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++Adds support for the new 'noflood_mark' setting in batman-adv.
++
++Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
++---
++ Makefile       |   1 +
++ README.rst     |  15 ++++++
++ batman_adv.h   |  12 +++++
++ noflood_mark.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++
++ 4 files changed, 168 insertions(+)
++ create mode 100644 noflood_mark.c
++
++--- a/Makefile
+++++ b/Makefile
++@@ -69,6 +69,7 @@ $(eval $(call add_command,multicast_mode
++ $(eval $(call add_command,neighbors,y))
++ $(eval $(call add_command,neighbors_json,y))
++ $(eval $(call add_command,network_coding,y))
+++$(eval $(call add_command,noflood_mark,y))
++ $(eval $(call add_command,orig_interval,y))
++ $(eval $(call add_command,originators,y))
++ $(eval $(call add_command,originators_json,y))
++--- a/README.rst
+++++ b/README.rst
++@@ -430,6 +430,21 @@ Example::
++ 
++ 
++ 
+++batctl noflood_mark
+++=======================
+++
+++display or modify noflood_mark setting
+++
+++Usage::
+++
+++  batctl noflood_mark|nf $value[/0x$mask]
+++
+++* Example 1: ``batctl nf 0x00000001/0xffffffff``
+++* Example 2: ``batctl nf 0x00040000/0xffff0000``
+++* Example 3: ``batctl nf 16``
+++* Example 4: ``batctl nf 0x0f``
+++
+++
++ batctl translocal
++ -----------------
++ 
++--- a/batman_adv.h
+++++ b/batman_adv.h
++@@ -481,6 +481,18 @@ enum batadv_nl_attrs {
++ 	 */
++ 	BATADV_ATTR_MULTICAST_FANOUT,
++ 
+++	/**
+++	 * @BATADV_ATTR_NOFLOOD_MARK: the noflood mark which allows to tag
+++	 *  frames which should never be broadcast flooded through the mesh.
+++	 */
+++	BATADV_ATTR_NOFLOOD_MARK,
+++
+++	/**
+++	 * @BATADV_ATTR_NOFLOOD_MASK: the noflood (bit)mask which allows to tag
+++	 *  frames which should never be broadcast flooded through the mesh.
+++	 */
+++	BATADV_ATTR_NOFLOOD_MASK,
+++
++ 	/* add attributes above here, update the policy in netlink.c */
++ 
++ 	/**
++--- /dev/null
+++++ b/noflood_mark.c
++@@ -0,0 +1,140 @@
+++// SPDX-License-Identifier: GPL-2.0
+++/* Copyright (C) 2009-2019  B.A.T.M.A.N. contributors:
+++ *
+++ * Antonio Quartulli <a@unstable.cc>
+++ * Linus Lüssing <linus.luessing@c0d3.blue>
+++ *
+++ * License-Filename: LICENSES/preferred/GPL-2.0
+++ */
+++
+++#include <errno.h>
+++#include <stddef.h>
+++#include <stdint.h>
+++#include <string.h>
+++
+++#include "main.h"
+++#include "sys.h"
+++
+++static struct noflood_mark_data {
+++	uint32_t noflood_mark;
+++	uint32_t noflood_mask;
+++} noflood_mark;
+++
+++static int parse_noflood_mark(struct state *state, int argc, char *argv[])
+++{
+++	struct settings_data *settings = state->cmd->arg;
+++	struct noflood_mark_data *data = settings->data;
+++	char *mask_ptr;
+++	char buff[256];
+++	uint32_t mark;
+++	uint32_t mask;
+++	char *endptr;
+++
+++	if (argc != 2) {
+++		fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n");
+++		return -EINVAL;
+++	}
+++
+++	strncpy(buff, argv[1], sizeof(buff));
+++	buff[sizeof(buff) - 1] = '\0';
+++
+++	/* parse the mask if it has been specified, otherwise assume the mask is
+++	 * the biggest possible
+++	 */
+++	mask = 0xFFFFFFFF;
+++	mask_ptr = strchr(buff, '/');
+++	if (mask_ptr) {
+++		*mask_ptr = '\0';
+++		mask_ptr++;
+++
+++		/* the mask must be entered in hex base as it is going to be a
+++		 * bitmask and not a prefix length
+++		 */
+++		mask = strtoul(mask_ptr, &endptr, 16);
+++		if (!endptr || *endptr != '\0')
+++			goto inval_format;
+++	}
+++
+++	/* the mark can be entered in any base */
+++	mark = strtoul(buff, &endptr, 0);
+++	if (!endptr || *endptr != '\0')
+++		goto inval_format;
+++
+++	data->noflood_mask = mask;
+++	/* erase bits not covered by the mask */
+++	data->noflood_mark = mark & mask;
+++
+++	return 0;
+++
+++inval_format:
+++	fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n");
+++	fprintf(stderr, "The following formats for mark(/mask) are allowed:\n");
+++	fprintf(stderr, " * 0x12345678\n");
+++	fprintf(stderr, " * 0x12345678/0xabcdef09\n");
+++	return -EINVAL;
+++}
+++
+++static int print_noflood_mark(struct nl_msg *msg, void *arg)
+++{
+++	struct nlattr *attrs[BATADV_ATTR_MAX + 1];
+++	struct nlmsghdr *nlh = nlmsg_hdr(msg);
+++	struct genlmsghdr *ghdr;
+++	int *result = arg;
+++
+++	if (!genlmsg_valid_hdr(nlh, 0))
+++		return NL_OK;
+++
+++	ghdr = nlmsg_data(nlh);
+++
+++	if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0),
+++		      genlmsg_len(ghdr), batadv_netlink_policy)) {
+++		return NL_OK;
+++	}
+++
+++	if (!attrs[BATADV_ATTR_NOFLOOD_MARK] ||
+++	    !attrs[BATADV_ATTR_NOFLOOD_MASK])
+++		return NL_OK;
+++
+++	printf("0x%08x/0x%08x\n",
+++	       nla_get_u32(attrs[BATADV_ATTR_NOFLOOD_MARK]),
+++	       nla_get_u32(attrs[BATADV_ATTR_NOFLOOD_MASK]));
+++
+++	*result = 0;
+++	return NL_STOP;
+++}
+++
+++static int get_noflood_mark(struct state *state)
+++{
+++	return sys_simple_nlquery(state, BATADV_CMD_GET_MESH,
+++				  NULL, print_noflood_mark);
+++}
+++
+++static int set_attrs_noflood_mark(struct nl_msg *msg, void *arg)
+++{
+++	struct state *state = arg;
+++	struct settings_data *settings = state->cmd->arg;
+++	struct noflood_mark_data *data = settings->data;
+++
+++	nla_put_u32(msg, BATADV_ATTR_NOFLOOD_MARK, data->noflood_mark);
+++	nla_put_u32(msg, BATADV_ATTR_NOFLOOD_MASK, data->noflood_mask);
+++
+++	return 0;
+++}
+++
+++static int set_noflood_mark(struct state *state)
+++{
+++	return sys_simple_nlquery(state, BATADV_CMD_SET_MESH,
+++				  set_attrs_noflood_mark, NULL);
+++}
+++
+++static struct settings_data batctl_settings_noflood_mark = {
+++	.data = &noflood_mark,
+++	.parse = parse_noflood_mark,
+++	.netlink_get = get_noflood_mark,
+++	.netlink_set = set_noflood_mark,
+++};
+++
+++COMMAND_NAMED(SUBCOMMAND, noflood_mark, "nf", handle_sys_setting,
+++	      COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK,
+++	      &batctl_settings_noflood_mark,
+++	      "[mark]            \tdisplay or modify noflood_mark setting");

scripts/basic_openwrt_config.sh

+#!/usr/bin/env bash
+
+set -euo pipefail
+
+echo "CONFIG_DEVEL=y"
+if [ "$GLUON_AUTOREMOVE" != "0" ]; then
+	echo "CONFIG_AUTOREMOVE=y"
+else
+	echo "# CONFIG_AUTOREMOVE is not set"
+fi

scripts/container.sh

+#!/usr/bin/env bash
+# shellcheck enable=check-unassigned-uppercase
+
+set -euo pipefail
+
+# move into base directory, in case this script is not executed via `make container`
+cd "$(dirname "$0")/.."
+
+# normalize branch name to reflect a valid image name
+BRANCH=$(git branch --show-current 2>/dev/null | sed 's/[^a-z0-9-]/_/ig')
+TAG="gluon:${BRANCH:-latest}"
+
+if [ "$(command -v podman)" ]
+then
+	podman build -t "${TAG}" contrib/docker
+	podman run -it --rm -u "$(id -u):$(id -g)" --userns=keep-id --volume="$(pwd):/gluon:z" "${TAG}"
+elif [ "$(command -v docker)" ]
+then
+	docker build -t "${TAG}" contrib/docker
+	docker run -it --rm -u "$(id -u):$(id -g)" --volume="$(pwd):/gluon" -e HOME=/gluon "${TAG}"
+else
+	echo "Please install either podman or docker. Exiting" >&2
+	exit 1
+fi

scripts/copy_output.lua

 local lib = dofile('scripts/target_lib.lua')
 local env = lib.env
 
+local target = env.GLUON_TARGET
+
+assert(target)
 assert(env.GLUON_IMAGEDIR)
 assert(env.GLUON_PACKAGEDIR)
 
 
-local target = arg[1]
-
 local openwrt_target
 local subtarget = env.SUBTARGET
 if subtarget ~= '' then
@@ -26,22 +27,30 @@ end
 mkdir(env.GLUON_IMAGEDIR..'/factory')
 mkdir(env.GLUON_IMAGEDIR..'/sysupgrade')
 mkdir(env.GLUON_IMAGEDIR..'/other')
+mkdir(env.GLUON_DEBUGDIR)
+mkdir(env.GLUON_METADIR..'/openwrt-profiles')
 
 
 lib.include(target)
 
 
+local function image_source(image)
+	return string.format(
+		'openwrt/bin/targets/%s/openwrt-%s-%s%s%s',
+		bindir, openwrt_target, image.name, image.in_suffix, image.extension)
+end
+
 local function clean(image, name)
 	local dir, file = image:dest_name(name, '\0', '\0')
 	lib.exec {'rm', '-f', dir..'/'..file}
 end
 
-for _, image in ipairs(lib.images) do
+for _, images in pairs(lib.images) do
+	for _, image in ipairs(images) do
 		clean(image, image.image)
 
 		local destdir, destname = image:dest_name(image.image)
-	local source = string.format('openwrt/bin/targets/%s/openwrt-%s-%s%s%s',
-		bindir, openwrt_target, image.name, image.in_suffix, image.extension)
+		local source = image_source(image)
 
 		lib.exec {'cp', source, destdir..'/'..destname}
 
@@ -53,9 +62,36 @@ for _, image in ipairs(lib.images) do
 		end
 	end
 
+	for _, image in ipairs(images) do
+		local source = image_source(image)
+		lib.exec {'rm', '-f', source}
+	end
+end
+
+-- copy kernel image with debug symbols
+local kernel_debug_glob = string.format('%s/gluon-\0-%s-kernel-debug.tar.zst',
+	env.GLUON_DEBUGDIR,
+	target)
+lib.exec {'rm', '-f', kernel_debug_glob}
+local kernel_debug_source = string.format('openwrt/bin/targets/%s/kernel-debug.tar.zst',
+	bindir)
+local kernel_debug_dest = string.format('%s/gluon-%s-%s-%s-kernel-debug.tar.zst',
+	env.GLUON_DEBUGDIR,
+	lib.site_code,
+	env.GLUON_RELEASE,
+	target)
+lib.exec {'cp', kernel_debug_source, kernel_debug_dest}
+
+-- copy OpenWrt profile JSON
+local profile_json_source = string.format('openwrt/bin/targets/%s/profiles.json',
+	bindir)
+local profile_json_dest = string.format('%s/openwrt-profiles/%s.json',
+	env.GLUON_METADIR,
+	target)
+lib.exec {'cp', profile_json_source, profile_json_dest}
 
 -- Copy opkg repo
-if lib.opkg and (env.GLUON_DEVICES or '') == '' then
+if (env.GLUON_DEVICES or '') == '' then
 	local package_prefix = string.format('gluon-%s-%s', lib.site_code, env.GLUON_RELEASE)
 	local function dest_dir(prefix)
 		return env.GLUON_PACKAGEDIR..'/'..prefix..'/'..bindir
@@ -64,5 +100,6 @@ if lib.opkg and (env.GLUON_DEVICES or '') == '' then
 	lib.exec {'rm', '-f', dest_dir('\0')..'/\0'}
 	lib.exec({'rmdir', '-p', dest_dir('\0')}, true, '2>/dev/null')
 	mkdir(dest_dir(package_prefix))
+	lib.exec {'rm', '-rf', 'openwrt/bin/targets/'..bindir..'/packages/tmp'}
 	lib.exec {'cp', 'openwrt/bin/targets/'..bindir..'/packages/\0', dest_dir(package_prefix)}
 end

scripts/default_feeds.sh

-DEFAULT_FEEDS="$(awk '{print $2}' openwrt/feeds.conf.default)"
+#!/bin/sh
+
+# list feeds which don't start with #
+DEFAULT_FEEDS="$(awk '!/^#/ {print $2}' openwrt/feeds.conf.default)"
+export DEFAULT_FEEDS

scripts/domain_aliases.lua

-local cjson = require 'cjson'
+local json = require 'jsonc'
 
-local function load_json(filename)
-	local f = assert(io.open(filename))
-	local json = cjson.decode(f:read('*a'))
-	f:close()
-	return json
-end
-
-local domain = load_json(arg[1])
+local domain = assert(json.load(arg[1]))
 for k, _ in pairs(domain.domain_names) do
 	print(k)
 end

scripts/feature_lib.lua

+local M = {}
+
+local function to_keys(t)
+	local ret = {}
+	for _, v in ipairs(t) do
+		ret[v] = true
+	end
+	return ret
+end
+
+local function collect_keys(t)
+	local ret = {}
+	for v in pairs(t) do
+		table.insert(ret, v)
+	end
+	return ret
+end
+
+function M.get_packages(files, features)
+	local enabled_features = to_keys(features)
+	local handled_features = {}
+	local packages = {}
+
+	local funcs = {}
+
+	local function add_pkgs(pkgs)
+		for _, pkg in ipairs(pkgs or {}) do
+			packages[pkg] = true
+		end
+	end
+
+	function funcs._(feature)
+		return enabled_features[feature] ~= nil
+	end
+
+	function funcs.feature(feature, pkgs)
+		assert(
+			type(feature) == 'string',
+			'Incorrect use of feature(): pass a feature name without _ as first argument')
+
+		if enabled_features[feature] then
+			handled_features[feature] = true
+			add_pkgs(pkgs)
+		end
+
+	end
+
+	function funcs.when(cond, pkgs)
+		assert(
+			type(cond) == 'boolean',
+			'Incorrect use of when(): pass a locical expression of _-prefixed strings as first argument')
+
+		if cond then
+			add_pkgs(pkgs)
+		end
+	end
+
+	-- Evaluate the feature definition files
+	for _, file in ipairs(files) do
+		local f, err = loadfile(file)
+		if not f then
+			error('Failed to parse feature definition: ' .. err)
+		end
+		setfenv(f, funcs)
+		f()
+	end
+
+	-- Handle default packages
+	for _, feature in ipairs(features) do
+		if not handled_features[feature] then
+			packages['gluon-' .. feature] = true
+		end
+	end
+
+	return collect_keys(packages)
+end
+
+return M

scripts/features.sh

-#!/bin/bash --norc
-
-set -e
-shopt -s nullglob
-
-
-nodefault() {
-	# We define a function instead of a variable, as variables could
-	# be predefined in the environment (in theory)
-	eval "gluon_feature_nodefault_$1() {
-		:
-	}"
-}
-
-packages() {
-	:
-}
-
-for f in package/features packages/*/features; do
-	. "$f"
-done
-
-
-# Shell variables can't contain minus signs, so we escape them
-# using underscores (and also escape underscores to avoid mapping
-# multiple inputs to the same output)
-sanitize() {
-	local v="$1"
-	v="${v//_/_1}"
-	v="${v//-/_2}"
-	echo -n "$v"
-}
-
-vars=()
-
-for feature in $1; do
-	if [ "$(type -t "gluon_feature_nodefault_${feature}")" != 'function' ]; then
-		echo "gluon-${feature}"
-	fi
-
-	vars+=("$(sanitize "$feature")=1")
-done
-
-
-nodefault() {
-	:
-}
-
-# shellcheck disable=SC2086
-packages() {
-	local cond="$(sanitize "$1")"
-	shift
-
-	# We only allow variable names, parentheses and the operators: & | !
-	if grep -q '[^A-Za-z0-9_()&|! ]' <<< "$cond"; then
-		exit 1
-	fi
-
-	# Let will return false when the result of the passed expression is 0,
-	# so we always add 1. This way false is only returned for syntax errors.
-	local ret="$(env -i "${vars[@]}" bash --norc -ec "let _result_='1+($cond)'; echo -n \"\$_result_\"" 2>/dev/null)"
-	case "$ret" in
-	2)
-		for pkg in "$@"; do
-			echo "$pkg"
-		done
-		;;
-	1)
-		;;
-	*)
-		exit 1
-	esac
-}
-
-for f in package/features packages/*/features; do
-	. "$f"
-done

scripts/feeds.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -11,7 +11,7 @@ rm -rf openwrt/feeds
 rm -rf openwrt/package/feeds
 
 (
-	echo 'src-link gluon_base ../../package'
+	echo "$GLUON_BASE_FEEDS"
 	for feed in $FEEDS; do
 		echo "src-link $feed ../../packages/$feed"
 	done

scripts/generate_manifest.lua

@@ -20,11 +20,8 @@ local function generate_line(model, dir, filename, filesize)
 	end
 
 	local file256sum = strip(lib.exec_capture {'scripts/sha256sum.sh', dir..'/'..filename})
-	local file512sum = strip(lib.exec_capture {'scripts/sha512sum.sh', dir..'/'..filename})
 
 	io.stdout:write(string.format('%s %s %s %s %s\n', model, env.GLUON_RELEASE, file256sum, filesize, filename))
-	io.stdout:write(string.format('%s %s %s %s\n', model, env.GLUON_RELEASE, file256sum, filename))
-	io.stdout:write(string.format('%s %s %s %s\n', model, env.GLUON_RELEASE, file512sum, filename))
 end
 
 local function generate(image)
@@ -48,8 +45,10 @@ local function generate(image)
 	end
 end
 
-for _, image in ipairs(lib.images) do
+for _, images in pairs(lib.images) do
+	for _, image in ipairs(images) do
 		if image.subdir == 'sysupgrade' then
 			generate(image)
 		end
 	end
+end

scripts/getversion.sh

+#!/bin/sh
+
+if [ $# -ne 1 ]; then
+	echo >&2 "Usage: getversion.sh <directory>"
+	exit 1
+fi
+
+cd "$1" || exit 1
+
+cat .scmversion 2>/dev/null && exit 0
+git --git-dir=.git describe --tags --always --abbrev=7 --dirty=+ 2>/dev/null && exit 0
+
+echo unknown

scripts/image_customization_lib.lua

+local M = {
+	customization_file = nil,
+}
+
+local function evaluate_device(env, dev)
+	local selections = {
+		features = {},
+		packages = {},
+	}
+	local funcs = {}
+	local device_overrides = {}
+
+	local function add_elements(element_type, element_list)
+		local error_msg = string.format(
+			'incorrect use of %s(): list of %s expected as argument',
+			element_type, element_type)
+		assert(type(element_list) == 'table', error_msg)
+
+		-- We depend on the fact both feature and package
+		-- are already initialized as empty tables
+		for _, element in ipairs(element_list) do
+			assert(type(element) == 'string', error_msg)
+			table.insert(selections[element_type], element)
+		end
+	end
+
+	local function add_override(ovr_key, ovr_value)
+		device_overrides[ovr_key] = ovr_value
+	end
+
+	function funcs.features(features)
+		add_elements('features', features)
+	end
+
+	function funcs.packages(packages)
+		add_elements('packages', packages)
+	end
+
+	function funcs.broken(broken)
+		assert(
+			type(broken) == 'boolean',
+			'incorrect use of broken(): boolean argument expected')
+		add_override('broken', broken)
+	end
+
+	function funcs.disable()
+		add_override('disabled', true)
+	end
+
+	function funcs.disable_factory()
+		add_override('disable_factory', true)
+	end
+
+	function funcs.device(device_names)
+		assert(
+			type(device_names) == 'table',
+			'incorrect use of device(): list of device names expected as argument')
+
+		for _, device_name in ipairs(device_names) do
+			assert(
+				type(device_name) == 'string',
+				'incorrect use of device(): list of device names expected as argument')
+
+			if device_name == dev.image then
+				return true
+			end
+		end
+
+		return false
+	end
+
+	function funcs.target(target, subtarget)
+		assert(
+			type(target) == 'string',
+			'incorrect use of target(): target name expected as first argument')
+
+		if target ~= env.BOARD then
+			return false
+		end
+
+		if subtarget then
+			assert(
+				type(subtarget) == 'string',
+				'incorrect use of target(): subtarget name expected as first argument')
+
+			if subtarget ~= env.SUBTARGET then
+				return false
+			end
+		end
+
+		return true
+	end
+
+	function funcs.device_class(class)
+		assert(
+			type(class) == 'string',
+			'incorrect use of device_class(): class name expected as first argument')
+
+		return dev.options.class == class
+	end
+
+	function funcs.include(path)
+		assert(
+			type(path) == 'string',
+			'incorrect use of include(): path expected as first argument')
+
+		if string.sub(path, 1, 1) ~= '/' then
+			assert(
+				string.find(path, '/') == nil,
+				'incorrect use of include(): including files from subdirectories is unsupported')
+			path = env.GLUON_SITEDIR .. '/' .. path
+		end
+		local f = assert(loadfile(path))
+		setfenv(f, funcs)
+		return f()
+	end
+
+	-- Evaluate the feature definition files
+	setfenv(M.customization_file, funcs)
+	M.customization_file()
+
+	return {
+		selections = selections,
+		device_overrides = device_overrides,
+	}
+end
+
+function M.get_selections(dev)
+	local eval_result = evaluate_device(M.env, dev)
+	return eval_result.selections
+end
+
+function M.device_overrides(dev)
+	local eval_result = evaluate_device(M.env, dev)
+	return eval_result.device_overrides
+end
+
+function M.init(env)
+	local filename = env.GLUON_SITEDIR .. '/image-customization.lua'
+
+	M.env = env
+	M.customization_file = assert(loadfile(filename))
+end
+
+return M

scripts/lint-editorconfig.sh

+#!/bin/sh
+
+set -e
+
+editorconfig-checker .github contrib docs package scripts targets tests ./*.* .luacheckrc .editorconfig

scripts/lint-sh.sh

@@ -3,7 +3,11 @@
 set -e
 
 is_scriptfile() {
-	echo "$1" | grep -qE '.*\.sh$' || head -n1 "$1" | grep -qE '^#.*(sh|bash)$'
+	echo "$1" | grep -q '\.sh$' || head -n1 "$1" | grep -qE '^#!(.*\<bash|/bin/sh)$'
+}
+
+is_initscript() {
+	head -n1 "$1" | grep -qxF '#!/bin/sh /etc/rc.common'
 }
 
 find contrib -type f | while read -r file; do
@@ -14,15 +18,18 @@ find contrib -type f | while read -r file; do
 done
 
 find package -type f | while read -r file; do
-	is_scriptfile "$file" || continue
-
+	if is_scriptfile "$file"; then
 		echo "Checking $file"
-	shellcheck -f gcc -x -s sh -e SC2039,SC1091,SC2155,SC2034 "$file"
+		shellcheck -f gcc -x -s sh -e SC2039,SC3043,SC3037,SC3057 "$file"
+	elif is_initscript "$file"; then
+		echo "Checking $file (initscript)"
+		shellcheck -f gcc -x -s sh -e SC2034,SC2039,SC3043,SC3037,SC3057 "$file"
+	fi
 done
 
 find scripts -type f | while read -r file; do
 	is_scriptfile "$file" || continue
 
 	echo "Checking $file"
-	shellcheck -f gcc -x -e SC2154,SC1090,SC2181,SC2155,SC2148,SC2034,SC2148 "$file"
+	shellcheck -f gcc -x "$file"
 done

scripts/module_check.sh

+#!/usr/bin/env bash
+
+set -e
+
+. scripts/modules.sh
+
+GLUONDIR="$(pwd)"
+
+if [ ! -d "$GLUONDIR/openwrt" ]; then
+	echo "You don't seem to have obtained the external repositories needed by Gluon; please call \`make update\` first!"
+	exit 1
+fi
+
+need_sync=false
+
+for module in $GLUON_MODULES; do
+	echo "Checking module '$module'"
+	var=${module//\//_}
+	_remote_commit=${var^^}_COMMIT
+	commit_expected=${!_remote_commit}
+
+	prefix=invalid
+	cd "$GLUONDIR/$module" 2>/dev/null && prefix="$(git rev-parse --show-prefix 2>/dev/null)"
+	if [ "$prefix" ]; then
+		echo "*** No Git repository found at '$module'."
+		need_sync=true
+		continue
+	fi
+
+	commit_actual="$(git rev-parse heads/base 2>/dev/null)"
+	if [ -z "$commit_actual" ]; then
+		echo "*** No base branch found at '$module'."
+		need_sync=true
+		continue
+	fi
+
+	if [ "$commit_expected" != "$commit_actual" ]; then
+		echo "*** base branch at '$module' did not match module file (expected: ${commit_expected}, actual: ${commit_actual})"
+		need_sync=true
+		continue
+	fi
+
+	# Use git status instead of git diff -q, as the latter doesn't
+	# check for untracked files
+	if [ "$(git status --porcelain 2>/dev/null | wc -l)" -ne 0 ]; then
+		echo "*** Module '$module' has uncommitted changes:"
+		git status --short
+	fi
+done
+
+if $need_sync; then
+	echo
+	# shellcheck disable=SC2016
+	echo 'Run `make update` to sync dependencies.'
+	echo
+fi

scripts/modules.sh

+#!/bin/sh
+
+# shellcheck source=./modules
 . ./modules
+
 [ ! -f "$GLUON_SITEDIR"/modules ] || . "$GLUON_SITEDIR"/modules
 
 # shellcheck disable=SC2086
-FEEDS="$(echo $GLUON_FEEDS $GLUON_SITE_FEEDS | tr ' ' '\n')"
+FEEDS="$(echo $GLUON_SITE_FEEDS $GLUON_FEEDS | tr ' ' '\n')"
 
 GLUON_MODULES=openwrt
 

scripts/patch.sh

-#!/bin/bash
+#!/usr/bin/env bash
+# shellcheck enable=check-unassigned-uppercase
 
 set -e
 shopt -s nullglob