sane-providers.inc with default providers for all distributions
I would like to create new file conf/distro/include/sane-providers.inc where we could store all default providers.
Every distro should include this file and probably should drop own PREFERRED_PROVIDERS if preferring same provider as sane-providers.inc.
I already prepared something, but not sure if its worth finishing. So I need your opinion.
With this file it would be easier to add PROVIDES to new recipe while forcing old provider in sane-providers for all other distributions (something like what happen with fso-apm in shr).
Maybe it will be nice to have all options in comment above the default provider.
I would use weak assignments in this file, but it means that this file needs to be included after all distro prefered providers, because distro config use weak assignments too (and also other includes like eglibc.inc).
As opkg have patch from cworth now I would add PROVIDERS=update-alternatives to opkg and change preferred u-a provider to opkg (removing 2 u-a scripts on target).
This process seems a bit error prone to me, so I can prepare patch for shr and angstrom where I can test with rebuild that "nothing" changed. For other distributions it would be nice to include sane-providers by distro maintainers.
Can I go ahead and send patches for this or do you see some dead-end as with SRCPV? :).
Regards,
Signature · 3 lines
uin:136542059 jid:[email protected] Jansa Martin sip:[email protected] JaMa
Quoted 2 lines · Martin Jansa
I would like to create new file conf/distro/include/sane-providers.inc where we could store all default providers.
If it's the same for everyone, can't it be put in bitbake.conf? I'm growing a bit tired of mandatory sane-* files to include.
regards,
Koen
Quoted 31 lines
Every distro should include this file and probably should drop own
PREFERRED_PROVIDERSif preferring same provider as sane-providers.inc.I already prepared something, but not sure if its worth finishing. So I need your opinion.
With this file it would be easier to add PROVIDES to new recipe while forcing old provider in sane-providers for all other distributions (something like what happen with fso-apm in shr).
Maybe it will be nice to have all options in comment above the default provider.
I would use weak assignments in this file, but it means that this file needs to be included after all distro prefered providers, because distro config use weak assignments too (and also other includes like eglibc.inc).
As opkg have patch from cworth now I would add PROVIDERS=update-alternatives to opkg and change preferred u-a provider to opkg (removing 2 u-a scripts on target).
This process seems a bit error prone to me, so I can prepare patch for shr and angstrom where I can test with rebuild that "nothing" changed. For other distributions it would be nice to include sane-providers by distro maintainers.
Can I go ahead and send patches for this or do you see some dead-end as with SRCPV? :).
Regards,
Hello,
Quoted 7 lines · Koen Kooi
Quoted 3 lines · Martin Jansa
I would like to create new file conf/distro/include/sane-providers.inc where we could store all default providers.
If it's the same for everyone, can't it be put in bitbake.conf? I'm growing a bit tired of mandatory sane-* files to include.
This makes much more sense to me.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Hi,
so here is series of patches for compatibility-providers.conf, required from bitbake.conf as suggested.
Tested on
shr-image for shr distribution (on gta02)
xorg-image for angstrom (on spitz)
only difference was db instead of db3 providers for shr.
Tricky part is to set u-a provider in sync with opkg provider (see 6th). We don't want to pull 2 different opkg versions one as opkg provider and second as u-a, but opkg is set as provder and also IPKG_VARIANG, u-a providers are set in sane-feed-ipk.inc/angstrom-ipkg.inc so its a bit error-prone, suggestions better patches are welcome.
Please test and ack.
Regards,
PATCH 1/6 bitbake.conf: create compatibility-providers.conf from micro, minimal, angstrom, shr preferred providers
--- conf/bitbake.conf | 1 + conf/compatibility-providers.conf | 70 +++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) create mode 100644 conf/compatibility-providers.conf
conf/bitbake.conf +1 -0
@@ -688,6 +688,7 @@ include conf/documentation.conf require conf/sanity.conf require conf/abi_version.conf require conf/enterprise.conf +require conf/compatibility-providers.conf ################################################################## # Weak variables (usually to retain backwards compatibility)
conf/compatibility-providers.conf new file +70 -0
70 lines not on this page · raw message
Signature · 1 line
1.6.5.4
PATCH 2/6 micro.conf: remove preferred providers as the same are defined in compatibility-providers.conf
--- conf/distro/micro.conf | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
conf/distro/micro.conf +0 -6
@@ -72,12 +72,6 @@ OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\ ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ############################################################################# -# PREFERRED PROVIDERS -############################################################################# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_virtual/libx11 = "libx11" -PREFERRED_PROVIDER_virtual/gail ?= "gtk+" -############################################################################# # PREFERRED VERSIONS ############################################################################# require conf/distro/include/sane-srcdates.inc
Signature · 1 line
1.6.5.4
PATCH 3/6 minimal.conf: remove preferred providers as the same are defined in compatibility-providers.conf
--- conf/distro/minimal.conf | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-)
conf/distro/minimal.conf +0 -14
@@ -84,20 +84,6 @@ LIBC ?= "eglibc" require conf/distro/include/sane-toolchain.inc ############################################################################# -# PREFERRED PROVIDERS -############################################################################# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_gconf = "gconf-dbus" -PREFERRED_PROVIDER_gtk+ = "gtk+" -PREFERRED_PROVIDER_libgpewidget = "libgpewidget" -PREFERRED_PROVIDER_virtual/db = "db3" -PREFERRED_PROVIDER_virtual/db-native = "db3-native" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" - -############################################################################# # PREFERRED VERSIONS ############################################################################# require conf/distro/include/sane-srcdates.inc
Signature · 1 line
1.6.5.4
PATCH 4/6 angstrom-2008.1.conf: remove preferred providers set already in compatibility-providers.conf
--- conf/distro/angstrom-2008.1.conf | 67 +------------------------------------- 1 files changed, 1 insertions(+), 66 deletions(-)
conf/distro/angstrom-2008.1.conf +1 -66
@@ -87,21 +87,6 @@ PREFERRED_VERSION_glibc-initial ?= "2.9" PREFERRED_VERSION_uclibc ?= "0.9.30.1" PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1" -# Preferred provider for virtual/psplash -# This enforces a specific brand to be used, in our case the angstrom -# one. In case you want to change the logo or something like that we -# suggest you to create another recipe (e.g: psplash-<brand>) for that -# and add that into your image. -# You can also opt to change or override this line, but that isn't -# needed because psplash is using update-alternatives. -PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom" - -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" -PREFERRED_PROVIDER_virtual/gail ?= "gtk+" - -PREFERRED_PROVIDER_libfribidi = "fribidi" - #powerpc needs additional patches to gcc ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
@@ -140,33 +125,10 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" # Toolchain virtuals: require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc -# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines -PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" -PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" -PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" - -PREFERRED_PROVIDER_virtual/db ?= "db" -PREFERRED_PROVIDER_virtual/db-native ?= "db-native" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" - -# Others: PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_esound ?= "pulseaudio" -PREFERRED_PROVIDER_gconf ?= "gconf" -PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" -PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_tslib-conf ?= "tslib" -PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -PREFERRED_PROVIDER_ntp ?= "ntp" PREFERRED_PROVIDER_hotplug = "udev" PREFERRED_PROVIDER_opkg ?= "opkg-nogpg" -PREFERRED_PROVIDER_libxss = "libxss" -PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" -PREFERRED_PROVIDER_bluez-libs = "bluez4" -PREFERRED_PROVIDER_bluez-utils = "bluez4" -PREFERRED_PROVIDER_util-linux = "util-linux-ng" + # The default is too old for linux-libc-headers-2.6.31: PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr29789"
@@ -175,43 +137,16 @@ ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4 ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" -# we don't ship gtk-directfb by default -PREFERRED_PROVIDER_gtk+ ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" - -# QT stuff: -# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone -PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free" - -#Silence a warning during parsing -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - #This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" require conf/distro/include/angstrom${ARM_ABI}.inc - - # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}" # Select xserver-xorg as default, since kdrive has been EOL'ed XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_xserver ?= "xserver-xorg" # do some task-base stuff here
Signature · 1 line
1.6.5.4
PATCH 5/6 shr.conf: remove preferred providers set already in compatibility-providers.conf
--- conf/distro/shr.conf | 28 +++------------------------- 1 files changed, 3 insertions(+), 25 deletions(-)
conf/distro/shr.conf +3 -25
@@ -156,34 +156,12 @@ require conf/distro/include/sane-toolchain.inc ############################################################################# # PREFERRED PROVIDERS ############################################################################# -PREFERRED_PROVIDER_qemu-native = "qemu-native" -PREFERRED_PROVIDER_gconf = "gconf" -PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo" -PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" PREFERRED_PROVIDER_gpsd = "fso-gpsd" -PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr" -PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr" -PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr" -PREFERRED_PROVIDER_libfribidi = "fribidi" -PREFERRED_PROVIDER_bluez-libs = "bluez4" -PREFERRED_PROVIDER_bluez-utils = "bluez4" -PREFERRED_PROVIDER_classpath = "classpath" -PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" -PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" -PREFERRED_PROVIDER_virtual/gail = "gtk+" -PREFERRED_PROVIDER_opkg = "opkg" -PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial" PREFERRED_PROVIDER_atd = "atd-over-fso" -PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free" -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_gtk+ = "gtk+" -PREFERRED_PROVIDER_libgpewidget = "libgpewidget" -PREFERRED_PROVIDER_virtual/db = "db3" -PREFERRED_PROVIDER_virtual/db-native = "db3-native" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_opkg= "opkg" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" +PREFERRED_PROVIDER_virtual/update-alternatives-native = "opkg-native" +PREFERRED_PROVIDER_virtual/update-alternatives = "opkg" ############################################################################# # PREFERRED VERSIONS
Signature · 1 line
1.6.5.4
PATCH 6/6 opkg: add provides for update-alternatives and set opkg as default u-a provider in sane-feed-ipk
--- conf/distro/angstrom-2008.1.conf | 5 ++++- conf/distro/include/angstrom-package-deb.inc | 4 ++-- conf/distro/include/angstrom-package-ipk.inc | 5 ++--- conf/distro/include/sane-feed-deb.inc | 4 ++-- conf/distro/include/sane-feed-ipk.inc | 5 ++--- conf/distro/shr.conf | 4 +--- recipes/opkg/opkg-native_svn.bb | 1 + recipes/opkg/opkg.inc | 2 +- recipes/opkg/opkg_svn.bb | 2 ++ recipes/tasks/task-boot.bb | 2 +- 10 files changed, 18 insertions(+), 16 deletions(-)
conf/distro/angstrom-2008.1.conf +4 -1
@@ -127,7 +127,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_hotplug = "udev" -PREFERRED_PROVIDER_opkg ?= "opkg-nogpg" +PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl" # The default is too old for linux-libc-headers-2.6.31: PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr29789"
@@ -145,6 +145,9 @@ require conf/distro/include/angstrom${ARM_ABI}.inc # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}" +# we need the same provider for opkg and u-a +PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl" + # Select xserver-xorg as default, since kdrive has been EOL'ed XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev"
conf/distro/include/angstrom-package-deb.inc +2 -2
@@ -1,4 +1,4 @@ INHERIT += "package_deb" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
conf/distro/include/angstrom-package-ipk.inc +2 -3
@@ -1,5 +1,4 @@ INHERIT += "package_ipk" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" - +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
conf/distro/include/sane-feed-deb.inc +2 -2
@@ -2,5 +2,5 @@ INHERIT += "package_deb" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
conf/distro/include/sane-feed-ipk.inc +2 -3
@@ -1,5 +1,4 @@ INHERIT += "package_ipk" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" - +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
conf/distro/shr.conf +1 -3
@@ -158,10 +158,8 @@ require conf/distro/include/sane-toolchain.inc ############################################################################# PREFERRED_PROVIDER_gpsd = "fso-gpsd" PREFERRED_PROVIDER_atd = "atd-over-fso" -PREFERRED_PROVIDER_opkg= "opkg" +PREFERRED_PROVIDER_opkg = "opkg" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "opkg-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "opkg" ############################################################################# # PREFERRED VERSIONS
recipes/opkg/opkg-native_svn.bb +1 -0
@@ -2,6 +2,7 @@ require opkg.inc DEPENDS = "curl-native" PR = "${INC_PR}" +PROVIDES =+ "virtual/update-alternatives-native" SRC_URI += "file://opkg-libdir.patch;patch=1;maxrev=342"
recipes/opkg/opkg.inc +1 -1
@@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "curl gpgme" PV = "0.1.6+svnr${SRCPV}" -INC_PR = "r16" +INC_PR = "r18" FILESPATHPKG =. "opkg:"
recipes/opkg/opkg_svn.bb +2 -0
@@ -4,6 +4,8 @@ DEPENDS_append = " openssl" PR = "${INC_PR}" +PROVIDES =+ "virtual/update-alternatives" +RPROVIDES_${PN} = "update-alternatives" PACKAGES =+ "libopkg-dev libopkg" FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
recipes/tasks/task-boot.bb +1 -1
@@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r50" +PR = "r51" inherit task
Signature · 1 line
1.6.5.4
Re: [PATCH 1/6] bitbake.conf: create compatibility-providers.conf from micro, minimal, angstrom, shr preferred providers
In reply to Martin JansaHello,
conf/compatibility-providers.conf line 6
Quoted 2 lines · Martin Jansa
conf/compatibility-providers.conf new file +2
-0+PREFERRED_PROVIDER_atd ?= "atd-over-fso" +PREFERRED_PROVIDER_atd ?= "atd"
I guess the first one ought to be commented out.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH 1/1 compatibility-providers.conf: comment out 2nd atd provider
--- conf/compatibility-providers.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
conf/compatibility-providers.conf +1 -1
@@ -2,7 +2,7 @@ # DEFAULT PREFERRED PROVIDERS # Every distribution should include this file. # It will make adding new providers easier. -PREFERRED_PROVIDER_atd ?= "atd-over-fso" +#PREFERRED_PROVIDER_atd ?= "atd-over-fso" PREFERRED_PROVIDER_atd ?= "atd" PREFERRED_PROVIDER_avahi ?= "avahi" PREFERRED_PROVIDER_bluez-libs ?= "bluez4"
Signature · 1 line
1.6.5.4
Re: [PATCH 1/6] bitbake.conf: create compatibility-providers.conf from micro, minimal, angstrom, shr preferred providers
In reply to Martin JansaQuoted 4 lines · Martin Jansa
Signed-off-by Martin Jansa<[email protected]>---
+PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu-shr"
That should be 'e-wm-menu'. The default provider should be the 'original' where possible.
regards,
Koen
Re: [PATCH 1/6] bitbake.conf: create compatibility-providers.conf from micro, minimal, angstrom, shr preferred providers
Quoted 5 lines · Koen Kooi
Quoted 1 line · Martin Jansa
+PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu-shr"
That should be 'e-wm-menu'. The default provider should be the 'original' where possible.
Sure, sorry for overlooking that, fixed locally.
Quoted 1 line
regards,
regards,
Signature · 3 lines
uin:136542059 jid:[email protected] Jansa Martin sip:[email protected] JaMa