KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

metadata.pl: add support for forcing sorting of profiles

Browse source 
Used to mix device profiles (specified in the image makefile) with
regular target profiles.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-05-10 14:43:46 +02:00
parent 87550a0e87
commit 1189af85fd
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/target.mk
View file

@ -59,6 +59,7 @@ extra_packages = $(if $(filter wpad-mini wpad nas,$(1)),iwinfo)
define ProfileDefault define ProfileDefault
NAME:= NAME:=
PRIORITY:=
PACKAGES:= PACKAGES:=
endef endef
@ -70,6 +71,7 @@ define Profile
dumpinfo : $(call shexport,Profile/$(1)/Description) dumpinfo : $(call shexport,Profile/$(1)/Description)
DUMPINFO += \ DUMPINFO += \
echo "Target-Profile: $(1)"; \ echo "Target-Profile: $(1)"; \
$(if $(PRIORITY), echo "Target-Profile-Priority: $(PRIORITY)"; ) \
echo "Target-Profile-Name: $(NAME)"; \ echo "Target-Profile-Name: $(NAME)"; \
echo "Target-Profile-Packages: $(PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES))"; \ echo "Target-Profile-Packages: $(PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES))"; \
if [ -f ./config/profile-$(1) ]; then \ if [ -f ./config/profile-$(1) ]; then \

4
scripts/metadata.pl
View file

@ -282,6 +282,10 @@ EOF
foreach my $target (@target) { foreach my $target (@target) {
my $profiles = $target->{profiles}; my $profiles = $target->{profiles};
$target->{sort} and @$profiles = sort {
$a->{priority} <=> $b->{priority} or
$a->{name} cmp $b->{name};
} @$profiles;
foreach my $profile (@$profiles) { foreach my $profile (@$profiles) {
print <<EOF; print <<EOF;

7
scripts/metadata.pm
View file

@ -84,11 +84,16 @@ sub parse_target_metadata($) {
$profile = { $profile = {
id => $1, id => $1,
name => $1, name => $1,
priority => 999,
packages => [] packages => []
}; };
push @{$target->{profiles}}, $profile; push @{$target->{profiles}}, $profile;
}; };
/^Target-Profile-Name:\s*(.+)\s*$/ and $profile->{name} = $1; /^Target-Profile-Name:\s*(.+)\s*$/ and do {
$target->{sort} = 1;
$profile->{name} = $1;
};
/^Target-Profile-Priority:\s*(\d+)\s*$/ and $profile->{priority} = $1;
/^Target-Profile-Packages:\s*(.*)\s*$/ and $profile->{packages} = [ split(/\s+/, $1) ]; /^Target-Profile-Packages:\s*(.*)\s*$/ and $profile->{packages} = [ split(/\s+/, $1) ];
/^Target-Profile-Description:\s*(.*)\s*/ and $profile->{desc} = get_multiline(*FILE); /^Target-Profile-Description:\s*(.*)\s*/ and $profile->{desc} = get_multiline(*FILE);
/^Target-Profile-Config:/ and $profile->{config} = get_multiline(*FILE, "\t"); /^Target-Profile-Config:/ and $profile->{config} = get_multiline(*FILE, "\t");