Author: nbd Date: 2014-09-23 12:41:15 +0200 (Tue, 23 Sep 2014) New Revision: 42654
Modified: trunk/include/package-defaults.mk trunk/include/package-dumpinfo.mk trunk/scripts/metadata.pl trunk/scripts/metadata.pm Log: build: allow packages with build variants to explicitly select a default variant Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/include/package-defaults.mk =================================================================== --- trunk/include/package-defaults.mk 2014-09-23 10:19:58 UTC (rev 42653) +++ trunk/include/package-defaults.mk 2014-09-23 10:41:15 UTC (rev 42654) @@ -53,6 +53,7 @@ HIDDEN:= URL:= VARIANT:= + DEFAULT_VARIANT:= USERID:= endef Modified: trunk/include/package-dumpinfo.mk =================================================================== --- trunk/include/package-dumpinfo.mk 2014-09-23 10:19:58 UTC (rev 42653) +++ trunk/include/package-dumpinfo.mk 2014-09-23 10:41:15 UTC (rev 42654) @@ -34,7 +34,8 @@ Menu-Depends: $(MDEPENDS) Provides: $(PROVIDES) $(if $(VARIANT),Build-Variant: $(VARIANT) -)$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS) +$(if $(DEFAULT_VARIANT),Default-Variant: $(VARIANT) +))$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS) )$(if $(HOST_BUILD_DEPENDS),Build-Depends/host: $(HOST_BUILD_DEPENDS) )$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES) )Section: $(SECTION) Modified: trunk/scripts/metadata.pl =================================================================== --- trunk/scripts/metadata.pl 2014-09-23 10:19:58 UTC (rev 42653) +++ trunk/scripts/metadata.pl 2014-09-23 10:41:15 UTC (rev 42654) @@ -684,7 +684,7 @@ $pkg->{buildonly} and $config = ""; print "package-$config += $pkg->{subdir}$pkg->{src}\n"; if ($pkg->{variant}) { - if (!defined($done{$pkg->{src}})) { + if (!defined($done{$pkg->{src}}) or $pkg->{variant_default}) { print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n"; } print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n" Modified: trunk/scripts/metadata.pm =================================================================== --- trunk/scripts/metadata.pm 2014-09-23 10:19:58 UTC (rev 42653) +++ trunk/scripts/metadata.pm 2014-09-23 10:41:15 UTC (rev 42654) @@ -115,6 +115,7 @@ /^Depends: \s*(.+)\s*$/ and $pkg->{depends} = [ split /\s+/, $1 ]; /^Hidden: \s*(.+)\s*$/ and $pkg->{hidden} = 1; /^Build-Variant: \s*([\w\-]+)\s*/ and $pkg->{variant} = $1; + /^Default-Variant: .*/ and $pkg->{variant_default} = 1; /^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1; /^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [ split /\s+/, $1 ]; /^Build-Depends\/(\w+): \s*(.+)\s*$/ and $pkg->{"builddepends/$1"} = [ split /\s+/, $2 ]; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
