From: Petr Štetiar <ynezz@true.cz>
Date: Sun, 29 Sep 2024 06:13:23 +0000 (+0000)
Subject: scripts: sha2rsync: fix missing feeds in additional_files list
X-Git-Tag: v19~3
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=bab1a77e2f778725ad515c2d5c98a602a506866e;p=buildbot.git

scripts: sha2rsync: fix missing feeds in additional_files list

Currently only packages feeds are being handled in phase2, so lets add the
other missing feeds.

Fixes: c3ddb0db167d ("phase2: use sha2rsync.pl for 'targetupload'")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/scripts/sha2rsync.pl b/scripts/sha2rsync.pl
index de286a1..6b9d2d1 100755
--- a/scripts/sha2rsync.pl
+++ b/scripts/sha2rsync.pl
@@ -97,12 +97,20 @@ while (defined($lline)) {
 
 # unconditionally add some mandatory files to rsynclist
 # add them last so they're transferred last: if everything else transferred correctly
-my @additional_files = qw(
-	packages/Packages.asc
-	packages/Packages.sig
-	sha256sums.asc
-	sha256sums.sig
-	sha256sums
+my @feeds = qw(base luci packages routing telephony);
+my @additional_files;
+
+for my $feed (@feeds) {
+    push @additional_files, (
+        "$feed/Packages.asc",
+        "$feed/Packages.sig",
+    );
+}
+
+push @additional_files, qw(
+    sha256sums.asc
+    sha256sums.sig
+    sha256sums
 );
 
 (my $basedir = $llist) =~ s!/[^/]+$!!;