libpcap: add optional netfilter support

[openwrt/staging/yousong.git] / scripts / target-metadata.pl

diff --git a/scripts/target-metadata.pl b/scripts/target-metadata.pl
index 07160dc4ea2c890886a2401a0ba1b597b0337afb..31de3c74c835cef38643d2b075c2d8c2563f9a19 100755 (executable)
--- a/scripts/target-metadata.pl
+++ b/scripts/target-metadata.pl
@@ -203,13 +203,14 @@ endchoice
 
 choice
        prompt "Target Profile"
+       default TARGET_MULTI_PROFILE if BUILDBOT
 
 EOF
        foreach my $target (@target) {
                my $profile = $target->{profiles}->[0];
                $profile or next;
                print <<EOF;
-       default TARGET_$target->{conf}_$profile->{id} if TARGET_$target->{conf}
+       default TARGET_$target->{conf}_$profile->{id} if TARGET_$target->{conf} && !BUILDBOT
 EOF
        }
 
@@ -218,6 +219,9 @@ EOF
 config TARGET_MULTI_PROFILE
        bool "Multiple devices"
        depends on HAS_DEVICES
+       help
+       Instead of only building a single image, or all images, this allows you
+       to select images to be built for multiple devices in one build.
 
 EOF
 
@@ -253,14 +257,34 @@ menu "Target Devices"
 
        config TARGET_ALL_PROFILES
                bool "Enable all profiles by default"
+               default BUILDBOT
 
        config TARGET_PER_DEVICE_ROOTFS
                bool "Use a per-device root filesystem that adds profile packages"
+               default BUILDBOT
+               help
+               When disabled, all device packages from all selected devices
+               will be included in all images by default. (Marked as <*>) You will
+               still be able to manually deselect any/all packages.
+               When enabled, each device builds it's own image, including only the
+               profile packages for that device.  (Marked as {M}) You will be able
+               to change a package to included in all images by marking as {*}, but
+               will not be able to disable a profile package completely.
+               
+               To get the most use of this setting, you must set in a .config stub
+               before calling "make defconfig".  Selecting TARGET_MULTI_PROFILE and
+               then manually selecting (via menuconfig for instance) this option
+               will have pre-defaulted all profile packages to included, making this
+               option appear to have had no effect.
 
 EOF
        foreach my $target (@target) {
-               my $profiles = $target->{profiles};
-               foreach my $profile (@{$target->{profiles}}) {
+               my @profiles = sort {
+                       my $x = $a->{name};
+                       my $y = $b->{name};
+                       "\L$x" cmp "\L$y";
+               } @{$target->{profiles}};
+               foreach my $profile (@profiles) {
                        next unless $profile->{id} =~ /^DEVICE_/;
                        print <<EOF;
 menuconfig TARGET_DEVICE_$target->{conf}_$profile->{id}