mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-10-31 18:38:10 +00:00
patches: carry forward feed script updates (0002)
Updates the feed management script with TIP-specific modifications. Carried forward from patches/0002. Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
@@ -1,9 +1,9 @@
|
|||||||
From 530da58d4c40613ce281db5ba39f5fcfa9587825 Mon Sep 17 00:00:00 2001
|
From 82e238ffbf14d62ae511c2d66e61a7361b45b75e Mon Sep 17 00:00:00 2001
|
||||||
From: John Crispin <john@phrozen.org>
|
From: John Crispin <john@phrozen.org>
|
||||||
Date: Fri, 19 Jun 2020 13:25:27 +0200
|
Date: Fri, 19 Jun 2020 13:25:27 +0200
|
||||||
Subject: [PATCH 02/68] scripts: update feed script
|
Subject: [PATCH 02/55] scripts: update feed script
|
||||||
|
|
||||||
gen_config.py requires the latest version of the feeds script.
|
gen_config.py requires some fixes to the feeds script.
|
||||||
|
|
||||||
Signed-off-by: John Crispin <john@phrozen.org>
|
Signed-off-by: John Crispin <john@phrozen.org>
|
||||||
---
|
---
|
||||||
@@ -11,10 +11,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
|
|||||||
1 file changed, 77 insertions(+)
|
1 file changed, 77 insertions(+)
|
||||||
|
|
||||||
diff --git a/scripts/feeds b/scripts/feeds
|
diff --git a/scripts/feeds b/scripts/feeds
|
||||||
index aee73e793f..94d6d91283 100755
|
index 959995c7af..dd9ddd7830 100755
|
||||||
--- a/scripts/feeds
|
--- a/scripts/feeds
|
||||||
+++ b/scripts/feeds
|
+++ b/scripts/feeds
|
||||||
@@ -667,6 +667,35 @@ sub refresh_config {
|
@@ -684,6 +684,35 @@ sub refresh_config {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,7 +50,7 @@ index aee73e793f..94d6d91283 100755
|
|||||||
sub install {
|
sub install {
|
||||||
my $name;
|
my $name;
|
||||||
my %opts;
|
my %opts;
|
||||||
@@ -699,6 +728,8 @@ sub install {
|
@@ -716,6 +745,8 @@ sub install {
|
||||||
install_src($feed, $name, exists($opts{f})) == 0 or $ret = 1;
|
install_src($feed, $name, exists($opts{f})) == 0 or $ret = 1;
|
||||||
get_feed($f->[1]);
|
get_feed($f->[1]);
|
||||||
}
|
}
|
||||||
@@ -59,7 +59,7 @@ index aee73e793f..94d6d91283 100755
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -856,6 +887,47 @@ sub update {
|
@@ -880,6 +911,47 @@ sub update {
|
||||||
return $failed;
|
return $failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,7 +107,7 @@ index aee73e793f..94d6d91283 100755
|
|||||||
sub feed_config() {
|
sub feed_config() {
|
||||||
foreach my $feed (@feeds) {
|
foreach my $feed (@feeds) {
|
||||||
my $installed = (-f "feeds/$feed->[1].index");
|
my $installed = (-f "feeds/$feed->[1].index");
|
||||||
@@ -907,6 +979,10 @@ Commands:
|
@@ -933,6 +1005,10 @@ Commands:
|
||||||
-i : Recreate the index only. No feed update from repository is performed.
|
-i : Recreate the index only. No feed update from repository is performed.
|
||||||
-f : Force updating feeds even if there are changed, uncommitted files.
|
-f : Force updating feeds even if there are changed, uncommitted files.
|
||||||
|
|
||||||
@@ -118,7 +118,7 @@ index aee73e793f..94d6d91283 100755
|
|||||||
clean: Remove downloaded/generated files.
|
clean: Remove downloaded/generated files.
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
@@ -920,6 +996,7 @@ my %commands = (
|
@@ -946,6 +1022,7 @@ my %commands = (
|
||||||
'search' => \&search,
|
'search' => \&search,
|
||||||
'uninstall' => \&uninstall,
|
'uninstall' => \&uninstall,
|
||||||
'feed_config' => \&feed_config,
|
'feed_config' => \&feed_config,
|
||||||
Reference in New Issue
Block a user