Skip to contentSkip to conversation

Richard Purdie : gst-plugins-bad: Add missing PR bump after curl change

oe-commits Martin Jansa 2 participants 2 messages Apr 17, 2012 – Apr 18, 2012 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20120417131445.7F9BF10219@opal

Martin Jansa

author
#1 lore raw

Please revert DISTRO_FEATURES_LIBC_DEFAULT change as it doesn't belong to this commit.

Quoted 57 lines · On Tue, Apr 17, 2012 at 01:14:45PM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: 2865d01773e405212aa6f531139898d90a6819a8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2865d01773e405212aa6f531139898d90a6819a8
Author: Richard Purdie <[email protected]>
Date:   Tue Apr 17 12:33:01 2012 +0100

gst-plugins-bad: Add missing PR bump after curl change

Signed-off-by Richard Purdie <[email protected]>

---

 meta/conf/distro/include/default-distrovars.inc    |    4 +++-
 .../gstreamer/gst-plugins-bad_0.10.23.bb           |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/conf/distro/include/default-distrovars.inc +3 -1
index 16b3108..f770919 100644
@@ -10,12 +10,14 @@ LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 LOCALE_UTF8_ONLY ?= "0"
 
-DISTRO_FEATURES_LIBC ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
+DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
 					libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
 					libc-getlogin libc-idn libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \
 					libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \
 					libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
 					libc-posix-wchar-io"
+DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
+DISTRO_FEATURES_LIBC_virtclass-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
 DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC}"
 
 IMAGE_FEATURES ?= ""
meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb +1 -1
index fbe1709..a277417 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 
 DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg curl"
 
-PR = "r1"
+PR = "r2"
 
 inherit gettext

_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 2 lines · Martin Jansa

Please revert DISTRO_FEATURES_LIBC_DEFAULT change as it doesn't belong to this commit.

Eeek, sorry about that :(. Not what I'd meant to do at all, this was intended for post 1.2 discussion.

I'm left in two minds over this change since it does fix a real world issue with toolchains and has now gone through two sets of build testing. Reverting it in some ways creates more risk that leaving it alone now :/.

I'm going to run some tests locally but I might leave this alone as it does improve certain problems and shouldn't have any negative effects (particularly as the automated testing completed against it).

Cheers,

Richard

Quoted 51 lines · On Tue, Apr 17, 2012 at 01:14:45PM +0000, [email protected] wrote:
Quoted 50 lines
Module: openembedded-core.git
Branch: master
Commit: 2865d01773e405212aa6f531139898d90a6819a8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2865d01773e405212aa6f531139898d90a6819a8
Author: Richard Purdie <[email protected]>
Date:   Tue Apr 17 12:33:01 2012 +0100

gst-plugins-bad: Add missing PR bump after curl change

Signed-off-by Richard Purdie <[email protected]>

---

 meta/conf/distro/include/default-distrovars.inc    |    4 +++-
 .../gstreamer/gst-plugins-bad_0.10.23.bb           |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/conf/distro/include/default-distrovars.inc +3 -1
index 16b3108..f770919 100644
@@ -10,12 +10,14 @@ LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 LOCALE_UTF8_ONLY ?= "0"
 
-DISTRO_FEATURES_LIBC ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
+DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
 					libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
 					libc-getlogin libc-idn libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \
 					libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \
 					libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
 					libc-posix-wchar-io"
+DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
+DISTRO_FEATURES_LIBC_virtclass-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
 DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC}"
 
 IMAGE_FEATURES ?= ""
meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb +1 -1
index fbe1709..a277417 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 
 DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg curl"
 
-PR = "r1"
+PR = "r2"
 
 inherit gettext