[oe] [meta-oe] [PATCH] fftwf and fftwl: exclude them from world
The fftw, fftwf and fftwl provide the same files (different contents), we should only build one of them, otherwise there would be warning WARNING: The recipe fftw is trying to install files into a shared area when those files already exist. Those files and their manifest location are: sysroots/qemux86-64/usr/include/fftw3.f03 Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3.h Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3q.f03 Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3.f Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3l.f03 Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot Please verify which package should provide the above files. and maybe errors (race issue): The recipe imagemagick.do_compiler error: fourier.c:69:19: fatal error: fftw3.h: No such file or directory #include fftw3.h This is because imagemagick.do_configure depends on fftw.populate_sysroot, but the files installed by fftw.populate_sysroot, maybe removed by fftwl or fftwf when they rebuild. Only build fftw in the world will fix the problem. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta-oe/recipes-support/fftw/fftwf_3.3.4.bb |2 ++ meta-oe/recipes-support/fftw/fftwl_3.3.4.bb |2 ++ 2 files changed, 4 insertions(+) diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb index 59f4a11..8731df7 100644 --- a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb +++ b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb @@ -6,3 +6,5 @@ EXTRA_OECONF += --enable-single \ SRC_URI[md5sum] = 2edab8c06b24feeb3b82bbb3ebf3e7b3 SRC_URI[sha256sum] = 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 + +EXCLUDE_FROM_WORLD = 1 diff --git a/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb index 8f37346..a56bbc8 100644 --- a/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb +++ b/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb @@ -4,3 +4,5 @@ EXTRA_OECONF += --enable-long-double SRC_URI[md5sum] = 2edab8c06b24feeb3b82bbb3ebf3e7b3 SRC_URI[sha256sum] = 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 + +EXCLUDE_FROM_WORLD = 1 -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-ruby] ruby: uprev it to 1.9.3-p547
From: Roy Li rongqing...@windriver.com
remove ruby-1.9.3-fix-s390x-build.patch, it has been merged into p547
Signed-off-by: Roy Li rongqing...@windriver.com
---
.../ruby/ruby/ruby-1.9.3-fix-s390x-build.patch | 12
.../ruby/{ruby_1.9.3-p429.bb = ruby_1.9.3-p547.bb}|5 ++---
2 files changed, 2 insertions(+), 15 deletions(-)
delete mode 100644
meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch
rename meta-ruby/recipes-devtools/ruby/{ruby_1.9.3-p429.bb =
ruby_1.9.3-p547.bb} (86%)
diff --git
a/meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch
b/meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch
deleted file mode 100644
index d0ade91..000
--- a/meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ruby-1.9.3-p0/ext/tk/extconf.rb.orig ruby-1.9.3-p0/ext/tk/extconf.rb
ruby-1.9.3-p0/ext/tk/extconf.rb.orig 2011-06-29 16:11:19.0
+0200
-+++ ruby-1.9.3-p0/ext/tk/extconf.rb2011-10-18 16:15:59.406299659 +0200
-@@ -114,7 +114,7 @@ def is_macosx?
- end
-
- def maybe_64bit?
-- /64|universal/ =~ RUBY_PLATFORM
-+ /64|universal|s390x/ =~ RUBY_PLATFORM
- end
-
- def check_tcltk_version(version)
diff --git a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb
b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb
similarity index 86%
rename from meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb
rename to meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb
index ddba0da..2404a5f 100644
--- a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb
+++ b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb
@@ -5,15 +5,14 @@ SRC_URI += \
file://0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch \
file://ruby-1.9.3-always-use-i386.patch \
file://ruby-1.9.3-disable-versioned-paths.patch \
-file://ruby-1.9.3-fix-s390x-build.patch \
file://ruby-1.9.3-rubygems-1.8.11-uninstaller.patch \
file://ruby-1.9.3-custom-rubygems-location.patch \
file://rubygems-1.8.11-binary-extensions.patch \
file://ruby-1.9.3-mkmf-verbose.patch \
file://ruby-1.9.3-install-cross.patch \
-SRC_URI[md5sum] = 993c72f7f805a9eb453f90b0b7fe0d2b
-SRC_URI[sha256sum] =
d192d1afc46a7ef27b9d0a3c7a67b509048984db2c38907aa82641bdf980acf4
+SRC_URI[md5sum] = 7531f9b1b35b16f3eb3d7bea786babfd
+SRC_URI[sha256sum] =
9ba118e4aba04c430bc4d5efb09b31a0277e101c9fd2ef3b80b9c684d7ae57a1
# it's unknown to configure script, but then passed to extconf.rb
# maybe it's not really needed as we're hardcoding the result with
--
1.7.10.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] fftwf and fftwl: exclude them from world
On Tue, Jul 08, 2014 at 11:18:47PM -0700, Robert Yang wrote: The fftw, fftwf and fftwl provide the same files (different contents), we should only build one of them, otherwise there would be warning WARNING: The recipe fftw is trying to install files into a shared area when those files already exist. Those files and their manifest location are: sysroots/qemux86-64/usr/include/fftw3.f03 Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3.h Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3q.f03 Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3.f Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3l.f03 Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot Please verify which package should provide the above files. and maybe errors (race issue): The recipe imagemagick.do_compiler error: fourier.c:69:19: fatal error: fftw3.h: No such file or directory #include fftw3.h This is because imagemagick.do_configure depends on fftw.populate_sysroot, but the files installed by fftw.populate_sysroot, maybe removed by fftwl or fftwf when they rebuild. Only build fftw in the world will fix the problem. But it doesn't fix the problem for people who are really building fftwl and fftw. If there is someone with this use-case can he send patch moving common parts to separate recipe used by all 3 or just rename/move files to have unique name? Or if they aren't needed at the same time, lets convert fftwl and fftwf to PACKAGECONFIG options in fftw. Regards, Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta-oe/recipes-support/fftw/fftwf_3.3.4.bb |2 ++ meta-oe/recipes-support/fftw/fftwl_3.3.4.bb |2 ++ 2 files changed, 4 insertions(+) diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb index 59f4a11..8731df7 100644 --- a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb +++ b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb @@ -6,3 +6,5 @@ EXTRA_OECONF += --enable-single \ SRC_URI[md5sum] = 2edab8c06b24feeb3b82bbb3ebf3e7b3 SRC_URI[sha256sum] = 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 + +EXCLUDE_FROM_WORLD = 1 diff --git a/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb index 8f37346..a56bbc8 100644 --- a/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb +++ b/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb @@ -4,3 +4,5 @@ EXTRA_OECONF += --enable-long-double SRC_URI[md5sum] = 2edab8c06b24feeb3b82bbb3ebf3e7b3 SRC_URI[sha256sum] = 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 + +EXCLUDE_FROM_WORLD = 1 -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] fftwf and fftwl: exclude them from world
On 07/09/2014 05:55 PM, Martin Jansa wrote: On Tue, Jul 08, 2014 at 11:18:47PM -0700, Robert Yang wrote: The fftw, fftwf and fftwl provide the same files (different contents), we should only build one of them, otherwise there would be warning WARNING: The recipe fftw is trying to install files into a shared area when those files already exist. Those files and their manifest location are: sysroots/qemux86-64/usr/include/fftw3.f03 Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3.h Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3q.f03 Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3.f Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot sysroots/qemux86-64/usr/include/fftw3l.f03 Matched in manifest-qemux86-64-fftwl.populate_sysroot manifest-qemux86-64-fftwf.populate_sysroot Please verify which package should provide the above files. and maybe errors (race issue): The recipe imagemagick.do_compiler error: fourier.c:69:19: fatal error: fftw3.h: No such file or directory #include fftw3.h This is because imagemagick.do_configure depends on fftw.populate_sysroot, but the files installed by fftw.populate_sysroot, maybe removed by fftwl or fftwf when they rebuild. Only build fftw in the world will fix the problem. But it doesn't fix the problem for people who are really building fftwl and fftw. If there is someone with this use-case can he send patch moving common parts to separate recipe used by all 3 or just rename/move files to have unique name? Or if they aren't needed at the same time, lets convert fftwl and fftwf to PACKAGECONFIG options in fftw. Yes, I think that PACKAGECONFIG is a good idea, will send patches tomorrow if no objections. // Robert Regards, Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta-oe/recipes-support/fftw/fftwf_3.3.4.bb |2 ++ meta-oe/recipes-support/fftw/fftwl_3.3.4.bb |2 ++ 2 files changed, 4 insertions(+) diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb index 59f4a11..8731df7 100644 --- a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb +++ b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb @@ -6,3 +6,5 @@ EXTRA_OECONF += --enable-single \ SRC_URI[md5sum] = 2edab8c06b24feeb3b82bbb3ebf3e7b3 SRC_URI[sha256sum] = 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 + +EXCLUDE_FROM_WORLD = 1 diff --git a/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb index 8f37346..a56bbc8 100644 --- a/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb +++ b/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb @@ -4,3 +4,5 @@ EXTRA_OECONF += --enable-long-double SRC_URI[md5sum] = 2edab8c06b24feeb3b82bbb3ebf3e7b3 SRC_URI[sha256sum] = 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 + +EXCLUDE_FROM_WORLD = 1 -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] usb-modeswitch: Do not try to use autotools
There is only one Makefile in the project so no use trying to use
autotools.
Signed-off-by: Jukka Rissanen jukka.rissa...@linux.intel.com
---
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
index 92d1ac4..761617c 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
@@ -2,8 +2,6 @@ SUMMARY = A mode switching tool for controlling 'flip flop'
(multiple device) U
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
-inherit autotools
-
DEPENDS = libusb1
SRC_URI =
http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2;
@@ -15,3 +13,7 @@ EXTRA_OEMAKE = TCL=${bindir}/tclsh
FILES_${PN} = ${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch
${sbindir} ${localstatedir}/lib/usb_modeswitch
RDEPENDS_${PN} = tcl
RRECOMMENDS_${PN} = usb-modeswitch-data
+
+do_install_append() {
+ oe_runmake DESTDIR=${D} install
+}
--
1.8.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] usb-modeswitch: Upgrade to latest version
Use the latest version of usb-modeswitch (2.2.0) and
usb-modeswitch-data (20140529). The data package depends
on new usb-modeswitch version so upgrade both of them at
the same time.
Signed-off-by: Jukka Rissanen jukka.rissa...@linux.intel.com
---
.../usb-modeswitch/usb-modeswitch-data_20130807.bb| 17 -
.../usb-modeswitch/usb-modeswitch-data_20140529.bb| 17 +
.../usb-modeswitch/usb-modeswitch_2.0.1.bb| 19 ---
.../usb-modeswitch/usb-modeswitch_2.2.0.bb| 19 +++
4 files changed, 36 insertions(+), 36 deletions(-)
delete mode 100644
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb
create mode 100644
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb
delete mode 100644
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
create mode 100644
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
diff --git
a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb
b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb
deleted file mode 100644
index e33f296..000
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = Data files for usbmodeswitch
-LICENSE = GPLv2
-LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
-
-inherit allarch
-
-SRC_URI =
http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${PV}.tar.bz2;
-SRC_URI[md5sum] = 91feff51deba6e48e78506b8f4db2274
-SRC_URI[sha256sum] =
a3114e2c1f38eed3ad0067df30e53a96313908a9539a8ea5d94a4d35651699eb
-
-do_install() {
-oe_runmake install DESTDIR=${D}
-}
-
-RDEPENDS_${PN} = usb-modeswitch
-FILES_${PN} += ${base_libdir}/udev/rules.d/ \
-${datadir}/usb_modeswitch
diff --git
a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb
b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb
new file mode 100644
index 000..258f740
--- /dev/null
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb
@@ -0,0 +1,17 @@
+SUMMARY = Data files for usbmodeswitch
+LICENSE = GPLv2
+LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
+
+inherit allarch
+
+SRC_URI =
http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${PV}.tar.bz2;
+SRC_URI[md5sum] = dff94177781298aaf0b3c2a3c3dea6b2
+SRC_URI[sha256sum] =
53889157937109e04dafe897c098ec94f3f44f9c0c83fc6ec8417aa9a587e536
+
+do_install() {
+oe_runmake install DESTDIR=${D}
+}
+
+RDEPENDS_${PN} = usb-modeswitch (= 2.2.0)
+FILES_${PN} += ${base_libdir}/udev/rules.d/ \
+${datadir}/usb_modeswitch
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
deleted file mode 100644
index 761617c..000
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = A mode switching tool for controlling 'flip flop' (multiple device)
USB gear
-LICENSE = GPLv2
-LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
-
-DEPENDS = libusb1
-
-SRC_URI =
http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2;
-SRC_URI[md5sum] = e48d4419d0574d342bb183f7465556d0
-SRC_URI[sha256sum] =
4706c9cfe825263e189f55730ea3d1d8634aeb15645a1098532e946e770f7f95
-
-EXTRA_OEMAKE = TCL=${bindir}/tclsh
-
-FILES_${PN} = ${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch
${sbindir} ${localstatedir}/lib/usb_modeswitch
-RDEPENDS_${PN} = tcl
-RRECOMMENDS_${PN} = usb-modeswitch-data
-
-do_install_append() {
- oe_runmake DESTDIR=${D} install
-}
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
new file mode 100644
index 000..cdab38c
--- /dev/null
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = A mode switching tool for controlling 'flip flop' (multiple device)
USB gear
+LICENSE = GPLv2
+LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
+
+DEPENDS = libusb1
+
+SRC_URI =
http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2;
+SRC_URI[md5sum] = f323fe700edd6ea404c40934ddf32b22
+SRC_URI[sha256sum] =
2752103de171ed5f6c8d6a6e3e73e16c9ee3e8e394dd39c5991f7680eb908a3a
+
+EXTRA_OEMAKE = TCL=${bindir}/tclsh
+
+FILES_${PN} = ${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch
${sbindir} ${localstatedir}/lib/usb_modeswitch
+RDEPENDS_${PN} = tcl
+RRECOMMENDS_${PN} = usb-modeswitch-data
+
+do_install_append() {
+ oe_runmake DESTDIR=${D} install
+}
--
1.8.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] usb-modeswitch: Upgrade to latest version
On Wed, Jul 09, 2014 at 04:55:22PM +0300, Jukka Rissanen wrote:
Use the latest version of usb-modeswitch (2.2.0) and
usb-modeswitch-data (20140529). The data package depends
on new usb-modeswitch version so upgrade both of them at
the same time.
Signed-off-by: Jukka Rissanen jukka.rissa...@linux.intel.com
---
.../usb-modeswitch/usb-modeswitch-data_20130807.bb| 17 -
.../usb-modeswitch/usb-modeswitch-data_20140529.bb| 17 +
.../usb-modeswitch/usb-modeswitch_2.0.1.bb| 19
---
.../usb-modeswitch/usb-modeswitch_2.2.0.bb| 19
+++
4 files changed, 36 insertions(+), 36 deletions(-)
delete mode 100644
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb
create mode 100644
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb
delete mode 100644
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
create mode 100644
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
diff --git
a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb
b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb
deleted file mode 100644
index e33f296..000
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = Data files for usbmodeswitch
-LICENSE = GPLv2
-LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
-
-inherit allarch
-
-SRC_URI =
http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${PV}.tar.bz2;
It would be even better if you resend it with -M as README says.
If you're going to do that, then please chagne usb-modeswitch-data-${PV}
to ${BP} and usb-modeswitch-${PV} as well.
Thanks!
-SRC_URI[md5sum] = 91feff51deba6e48e78506b8f4db2274
-SRC_URI[sha256sum] =
a3114e2c1f38eed3ad0067df30e53a96313908a9539a8ea5d94a4d35651699eb
-
-do_install() {
-oe_runmake install DESTDIR=${D}
-}
-
-RDEPENDS_${PN} = usb-modeswitch
-FILES_${PN} += ${base_libdir}/udev/rules.d/ \
-${datadir}/usb_modeswitch
diff --git
a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb
b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb
new file mode 100644
index 000..258f740
--- /dev/null
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb
@@ -0,0 +1,17 @@
+SUMMARY = Data files for usbmodeswitch
+LICENSE = GPLv2
+LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
+
+inherit allarch
+
+SRC_URI =
http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${PV}.tar.bz2;
+SRC_URI[md5sum] = dff94177781298aaf0b3c2a3c3dea6b2
+SRC_URI[sha256sum] =
53889157937109e04dafe897c098ec94f3f44f9c0c83fc6ec8417aa9a587e536
+
+do_install() {
+oe_runmake install DESTDIR=${D}
+}
+
+RDEPENDS_${PN} = usb-modeswitch (= 2.2.0)
+FILES_${PN} += ${base_libdir}/udev/rules.d/ \
+${datadir}/usb_modeswitch
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
deleted file mode 100644
index 761617c..000
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = A mode switching tool for controlling 'flip flop' (multiple
device) USB gear
-LICENSE = GPLv2
-LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
-
-DEPENDS = libusb1
-
-SRC_URI =
http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2;
-SRC_URI[md5sum] = e48d4419d0574d342bb183f7465556d0
-SRC_URI[sha256sum] =
4706c9cfe825263e189f55730ea3d1d8634aeb15645a1098532e946e770f7f95
-
-EXTRA_OEMAKE = TCL=${bindir}/tclsh
-
-FILES_${PN} = ${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch
${sbindir} ${localstatedir}/lib/usb_modeswitch
-RDEPENDS_${PN} = tcl
-RRECOMMENDS_${PN} = usb-modeswitch-data
-
-do_install_append() {
- oe_runmake DESTDIR=${D} install
-}
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
new file mode 100644
index 000..cdab38c
--- /dev/null
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = A mode switching tool for controlling 'flip flop' (multiple
device) USB gear
+LICENSE = GPLv2
+LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
+
+DEPENDS = libusb1
+
+SRC_URI =
http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2;
+SRC_URI[md5sum] = f323fe700edd6ea404c40934ddf32b22
+SRC_URI[sha256sum] =
2752103de171ed5f6c8d6a6e3e73e16c9ee3e8e394dd39c5991f7680eb908a3a
+
+EXTRA_OEMAKE = TCL=${bindir}/tclsh
+
+FILES_${PN} = ${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch
${sbindir} ${localstatedir}/lib/usb_modeswitch
[oe] [meta-qt5][PATCH] qtbase: fix 0003-Add-external-hostbindir-option.patch
The isEmpty function takes a variable name instead of a value.
As $$[QT_EXTERNAL_HOST_BINS] is a built-in we need to assign it to a
variable to check if it is empty.
If QT_EXTERNAL_HOST_BINS is empty (as is the case for generated Qt 5
toolchains), we need to fallback to QT_HOST_BINS when determining
the path for tools such as moc otherwise you get the following error
when building a Qt project using the generated toolchain:
make[1]: /moc: Command not found
Signed-off-by: Jonathan Liu net...@gmail.com
---
.../0003-Add-external-hostbindir-option.patch | 65 +-
.../0003-Add-external-hostbindir-option.patch | 65 +-
2 files changed, 78 insertions(+), 52 deletions(-)
diff --git
a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
index 44d17ca..2abea8f 100644
--- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
@@ -1,4 +1,4 @@
-From b45d963702c139ea4f5b5ce572d046511a878d81 Mon Sep 17 00:00:00 2001
+From b544f5f3462e2981ada045a32038b7f116f8590c Mon Sep 17 00:00:00 2001
From: Martin Jansa martin.ja...@gmail.com
Date: Sat, 6 Apr 2013 13:15:07 +0200
Subject: [PATCH 03/12] Add -external-hostbindir option
@@ -22,25 +22,26 @@ Upstream-Status: Pending
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Simon Busch morp...@gravedo.de
+Signed-off-by: Jonathan Liu net...@gmail.com
---
configure | 15 +++
- mkspecs/features/qt_functions.prf | 2 +-
- mkspecs/features/qt_tool.prf| 3 +--
+ mkspecs/features/qt_functions.prf | 6 +-
+ mkspecs/features/qt_tool.prf| 4 ++--
qmake/property.cpp | 1 +
- qtbase.pro | 12 +---
+ qtbase.pro | 14 +++---
src/corelib/Qt5CoreConfigExtras.cmake.in| 6 +++---
src/corelib/global/qlibraryinfo.cpp | 3 ++-
src/corelib/global/qlibraryinfo.h | 1 +
src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
tools/configure/configureapp.cpp| 8
- 11 files changed, 44 insertions(+), 13 deletions(-)
+ 11 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
-index 4eae0d3..48d5119 100755
+index d5c2b08..dcd066c 100755
--- a/configure
+++ b/configure
-@@ -777,6 +777,7 @@ QT_HOST_BINS=
+@@ -759,6 +759,7 @@ QT_HOST_BINS=
QT_HOST_LIBS=
QT_HOST_DATA=
QT_EXT_PREFIX=
@@ -48,7 +49,7 @@ index 4eae0d3..48d5119 100755
#flags for SQL drivers
QT_CFLAGS_PSQL=
-@@ -896,6 +897,7 @@ while [ $# -gt 0 ]; do
+@@ -878,6 +879,7 @@ while [ $# -gt 0 ]; do
-testsdir| \
-hostdatadir| \
-hostbindir| \
@@ -56,7 +57,7 @@ index 4eae0d3..48d5119 100755
-hostlibdir| \
-extprefix| \
-sysroot| \
-@@ -1110,6 +1112,9 @@ while [ $# -gt 0 ]; do
+@@ -1092,6 +1094,9 @@ while [ $# -gt 0 ]; do
extprefix)
QT_EXT_PREFIX=$VAL
;;
@@ -66,7 +67,7 @@ index 4eae0d3..48d5119 100755
pkg-config)
if [ $VAL = yes ] || [ $VAL = no ]; then
CFG_PKGCONFIG=$VAL
-@@ -2248,6 +2253,10 @@ Installation options:
+@@ -2230,6 +2235,10 @@ Installation options:
-hostdatadir dir . Data used by qmake will be installed to dir
(default HOSTPREFIX)
@@ -77,7 +78,7 @@ index 4eae0d3..48d5119 100755
Configure options:
The defaults (*) are usually acceptable. A plus (+) denotes a default value
-@@ -2915,6 +2924,11 @@ fi
+@@ -2897,6 +2906,11 @@ fi
# command line and environment validation
#---
@@ -89,7 +90,7 @@ index 4eae0d3..48d5119 100755
# update QT_CONFIG to show our current predefined configuration
CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
case $CFG_QCONFIG in
-@@ -3595,6 +3609,7 @@ static const char qt_configure_prefix_path_strs[][256 +
12] = {
+@@ -3577,6 +3591,7 @@ static const char qt_configure_prefix_path_strs[][256 +
12] = {
qt_hbinpath=$QT_HOST_BINS,
qt_hlibpath=$QT_HOST_LIBS,
qt_hdatpath=$QT_HOST_DATA,
@@ -98,29 +99,37 @@ index 4eae0d3..48d5119 100755
qt_hostspec=$shortspec,
#endif
diff --git a/mkspecs/features/qt_functions.prf
b/mkspecs/features/qt_functions.prf
-index d41fe3b..050a4a7 100644
+index 9a4d80e..dfc1cff 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
-@@ -193,7 +193,7 @@ defineTest(qtAddRpathLink) {
+@@ -193,7 +193,11 @@ defineTest(qtAddRpathLink) {
defineTest(qtPrepareTool) {
cmd = $$eval(QT_TOOL.$${2}.binary)
isEmpty(cmd) {
-cmd = $$[QT_HOST_BINS]/$$2
-+cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2
