Module: meta-angstrom Branch: master Commit: e7f543707540fbf8f26e09985c276fe7f14e48d5
Author: Koen Kooi <k...@dominion.thruhere.net> Date: Mon Jan 16 12:16:26 2012 +0100 angstrom ipk: fix u-a entries Signed-off-by: Koen Kooi <k...@dominion.thruhere.net> --- conf/distro/include/angstrom-package-ipk.inc | 6 ++++-- conf/distro/include/angstrom-package-rpm.inc | 3 +++ conf/distro/include/angstrom.inc | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc index 4ce0c5e..705c88a 100644 --- a/conf/distro/include/angstrom-package-ipk.inc +++ b/conf/distro/include/angstrom-package-ipk.inc @@ -1,8 +1,10 @@ INHERIT += "package_ipk" -EXTRAOPKGCONFIG = "opkg-config-base angstrom-feed-configs" +ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs" -DISTRO_UPDATE_ALTERNATIVES = "update-alternatives-cworth" +EXTRAOPKGCONFIG = "opkg-config-base angstrom-feed-configs" + +DISTRO_UPDATE_ALTERNATIVES = "opkg" # we need the same provider for opkg and u-a PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" diff --git a/conf/distro/include/angstrom-package-rpm.inc b/conf/distro/include/angstrom-package-rpm.inc index 7378f12..5b85dde 100644 --- a/conf/distro/include/angstrom-package-rpm.inc +++ b/conf/distro/include/angstrom-package-rpm.inc @@ -1,2 +1,5 @@ + +ANGSTROM_FEED_CONFIGS ?= "zypper" + INHERIT += "package_rpm" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 5d871c6..def925d 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -87,7 +87,7 @@ ANGSTROM_URI ?= "http://feeds.angstrom-distribution.org"; #Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list) # usefull for derivative distros and local testing # As this is runtime we can't and won't use virtual/feed-configs -ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs" +ANGSTROM_FEED_CONFIGS ??= "angstrom-feed-configs" #Set the default maintainer to angstrom-dev MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>" _______________________________________________ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
