diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 3 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 3 | ||||
| -rw-r--r-- | conf/machine/include/omap3.inc | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 5e635c3198..e19a0ff1b7 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9886,6 +9886,10 @@ sha256=dfffb80ef01b8fee9af3576311e65b60c378d9985099dea532be090ede54ebaa md5=a861ccbb90a176d1242608502f45f0ac sha256=12205d01cb99900ed6f936a09ac31b5849f8a7ff3c9a93e5857a76dc3e30788a +[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.15.tar.bz2] +md5=19bc6cc07951b3382d1ac8525b20e83f +sha256=831f450a0fa18c881b00ec50e8916ed66ca0fecb53cd1939f0abcc02930f9847 + [http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.2.tar.bz2] md5=03d3d0b5f19014fe0065234a3ea65ee6 sha256=dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81 diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 470c31a788..9b1968f343 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -160,6 +160,9 @@ PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" PREFERRED_PROVIDER_bluez-libs = "bluez4" PREFERRED_PROVIDER_bluez-utils = "bluez4" +ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez3 has been replace by bluez4" +ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez3 has been replace by bluez4" + # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index a40fe5fbc8..669c8ada3c 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -70,6 +70,9 @@ INHERIT += "debian" #activate config checker INHERIT += "sanity" +#activate the blacklister +INHERIT += "angstrom" + #make devshell available as task INHERIT += "devshell" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index ea395b441b..9c3c8f59e1 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r39" +MACHINE_KERNEL_PR = "r40" KERNEL_IMAGETYPE = "uImage" |