fix broken image builder dependencies

SVN-Revision: 3496

diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index 9b6cdc18919a85f495ad283585a868caebd0bffe..584d2aa4a2bb6bc7681c4345cfdddbd7b0823d1f 100644 (file)
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -143,8 +143,6 @@ source "package/sdk/Config.in"
 
 config BR2_PACKAGE_IMAGEBUILDER
        bool "OpenWrt Image Builder"
-       select BR2_PACKAGE_IPKG_SH
-       select BR2_PACKAGE_PPTP
        default y if CONFIG_DEVEL
        help
          Build an OpenWrt Image Builder.

diff --git a/openwrt/package/ipkg/Config.in b/openwrt/package/ipkg/Config.in
index 1fa0ec8c1e6b17c6931f59719120e301fdd3ed44..90c512b4a52a7d4d237b9d3a3973df680baf6d7f 100644 (file)
--- a/openwrt/package/ipkg/Config.in
+++ b/openwrt/package/ipkg/Config.in
@@ -23,6 +23,7 @@ config BR2_PACKAGE_IPKG_C
 config BR2_PACKAGE_IPKG_SH
        tristate "ipkg - itsy package management system (shell version)"
        default m if CONFIG_DEVEL
+       default m if BR2_PACKAGE_IMAGEBUILDER
        select BR2_PACKAGE_IPKG
        help
         Lightweight package management system

diff --git a/openwrt/package/pptp/Config.in b/openwrt/package/pptp/Config.in
index 905506e39d8052bcde191ca359656e42145359a8..778311b981c7acc45d8e76f26a71ade792ab2623 100644 (file)
--- a/openwrt/package/pptp/Config.in
+++ b/openwrt/package/pptp/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PPTP
        prompt "pptp - PPTP (Point-to-Point Tunneling Protocol) client"
        tristate
        default m if CONFIG_DEVEL
+       default m if BR2_PACKAGE_IMAGEBUILDER
        select BR2_PACKAGE_KMOD_GRE
        select BR2_PACKAGE_PPP
        help