disable the image builder in menuconfig for profiles with custom kernel configs

SVN-Revision: 6341

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index d27cd8e59d72c0e26a8be5f2b34e204d0107f518..4a05628a54fac1c76ba7ef2a0b2ac330c3e79379 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -53,6 +53,7 @@ sub parse_target_metadata() {
                        }
                        $profile->{desc} = $desc;
                };
+               /^Target-Profile-Kconfig:/ and $profile->{kconfig} = 1;
        }
        foreach my $target (@target) {
                @{$target->{profiles}} > 0 or $target->{profiles} = [
@@ -298,6 +299,7 @@ config LINUX_$target->{conf}_$profile->{id}
        bool "$profile->{name}"
        depends LINUX_$target->{conf}
 EOF
+                       $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
                        my %pkgs;
                        foreach my $pkg (@{$target->{packages}}, @{$profile->{packages}}) {
                                $pkgs{$pkg} = 1;

diff --git a/target/Config.in b/target/Config.in
index 64f775877b31ca92f6b58535a28c3e34ed4517f4..8ff7bee52bb28f9ec5b11261447c9f7f57dc002e 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -35,6 +35,9 @@ config USES_JFFS2
 config USES_EXT2
        bool
 
+config PROFILE_KCONFIG 
+       bool
+
 # Architecture selection
 
 config i386

diff --git a/target/imagebuilder/Config.in b/target/imagebuilder/Config.in
index 95aeb5d1a50e0b10e5cd820cecde7fbbe4964903..50b5825812c5eb099cdee75c90a472e979ef10c1 100644 (file)
--- a/target/imagebuilder/Config.in
+++ b/target/imagebuilder/Config.in
@@ -1,6 +1,7 @@
 config IB
        bool "Build the OpenWrt Image Builder"
        depends !TARGET_ROOTFS_INITRAMFS
+       depends !PROFILE_KCONFIG
        default y if ALL
        help
          This is essentially a stripped-down version of the buildroot