[oe] [meta-java][PATCH v2] openjdk-8: 'do_unpack_remove_X11_wrappers' confuses pyro bitbake parser
When building without X11 support on the sumo or master branches of
meta-java with the pyro branch of poky, meta-oe, etc, the recipe fails
to parse.
Renaming the function to anything else allows the recipe to be parsed. The
problem appears to be the word "_remove_".
Signed-off-by: Matthew McClain
---
recipes-core/openjdk/openjdk-8-common.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-core/openjdk/openjdk-8-common.inc
b/recipes-core/openjdk/openjdk-8-common.inc
index b2020c3..fbb10be 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -39,7 +39,7 @@ do_unpack_extract_submodules () {
tar xjf ${WORKDIR}/${NASHORN_FILE} --transform "s,-${NASHORN_CHANGESET},,g"
}
-do_unpack_remove_X11_wrappers() {
+do_unpack_delete_X11_wrappers() {
find ${S}/jdk/src/solaris/classes/sun/awt/X11 -maxdepth 1 -name '*.java'
-delete
}
@@ -153,7 +153,7 @@ def jdk_configure_options(d):
return options[3]
do_unpack[postfuncs] += "do_unpack_extract_submodules"
-do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '',
'do_unpack_remove_X11_wrappers', d)}"
+do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '',
'do_unpack_delete_X11_wrappers', d)}"
do_configure_prepend() {
export ${@jdk_environment_options(d)}
--
2.18.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH] openjdk-8: 'do_unpack_remove_X11_wrappers' confuses pyro bitbake parser
On 7/18/18 12:36 AM, Richard Leitner wrote: On 07/17/2018 09:20 PM, Matthew McClain wrote: Renaming the function to anything else allows the recipe to be parsed. The problem appears to be the word "_remove_". This affects both the sumo and master branches. In the subject you say it causes problems with the pyro branch, but here you say sumo and master... So which branches are really affected? Can you please adapt the title/commit-message accordingly? The issue is with building the sumo or master branches of meta-java with the pyro branches of meta-poky, meta-oe, etc. I should just put this in the summary. I suspect it's because _remove (like _append) is used to modify variables. If I get it right the mentioned parsing error only occurs when we have no X11 (in PACKAGECONFIG). Is that true? Can you please mention it in the commit message? If I comment out the do_unpack[postfuncs] line, the recipe parses fine, so I would assume if X11 is configured, it would be fine. I didn't include the error in the summary as it's long and messy. parser = bb.codeparser.ShellParser(key, logger) > parser.parse_shell(parsedvar.value) deps = deps | shelldeps File "/home/test/yocto/poky/bitbake/lib/bb/codeparser.py", line 361, in ShellParser.parse_shell(value=None): > self._parse_shell(value) self.execs = set(cmd for cmd in self.allexecs if cmd not in self.funcdefs) File "/home/test/yocto/poky/bitbake/lib/bb/codeparser.py", line 370, in ShellParser._parse_shell(value=None): try: > tokens, _ = pyshyacc.parse(value, eof=True, debug=False) except pyshlex.NeedMore: File "/home/test/yocto/poky/bitbake/lib/bb/pysh/pyshyacc.py", line 668, in parse(input=None, eof=True, debug=False): lexer = pyshlex.PLYLexer() > remaining = lexer.add(input, eof) if lexer.is_empty(): File "/home/test/yocto/poky/bitbake/lib/bb/pysh/pyshlex.py", line 580, in PLYLexer.add(data=None, eof=True): """ > self._input += list(data) self._parse(eof) TypeError: 'NoneType' object is not iterable Thanks, Matthew -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] cryptsetup: Upgrade to 2.0.3
On Wed, Jul 18, 2018 at 1:34 AM Yu, Mingli wrote:
>
>
>
> On 2018年07月17日 10:37, Khem Raj wrote:
> >
> >
> > On 7/16/18 6:58 PM, mingli...@windriver.com wrote:
> >> From: Mingli Yu
> >>
> >> * Update the homepage to https://gitlab.com/cryptsetup/cryptsetup
> >> * Add json-c to DEPENDS as cryptsetup requires the
> >>json-c library for JSON data processing since cryptsetup
> >>2.0.0 per "The LUKS2 format and features" part of
> >>
> >> https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.0-ReleaseNotes
> >>
> >> * Add file /usr/lib/tmpfiles.d/cryptsetup.conf to
> >>FILES_${PN} when systemd enabled in DISTRO_FEATURES
> >>
> >
> > I am seeing a new failure for
> > meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb
> >
> >
> > | ../../../git/src/plugins/crypto.c: In function 'bd_crypto_tc_open':
> > | ../../../git/src/plugins/crypto.c:973:12: error: missing initializer
> > for field 'veracrypt_pim' of 'struct crypt_params_tcrypt'
> > [-Werror=missing-field-initializers]
> > | struct crypt_params_tcrypt params =
> > {NULL,0,NULL,0,NULL,NULL,NULL,0,0};
> > | ^~~
> > | In file included from ../../../git/src/plugins/crypto.c:22:
> > |
> > /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/libblockdev/2.16-r0/recipe-sysroot/usr/include/libcryptsetup.h:436:11:
>
> Hi Khem,
>
> The root cause for this failure is some API changed after cryptsetup
> upgrade to 2.0.3 and libblockdev depends on cryptsetup and we should
> also upgrade libblockdev accordingly.
>
> And I notice there is already a patch with subject "[oe]
> [PATCH][meta-oe] libblockdev: 2.16 -> 2.18" has already upgraded the
> libblockdev to 2.18.
>
> After upgrade to 2.18, the build failure for libblockdev which your saw
> should be gone, so I think there is no need to resend V3 for cryptsetup.
> What do you think?
Thats fine. I will pickup that series on top of
this and see how it goes.
>
> Thanks,
>
> > note: 'veracrypt_pim' declared here
> > | uint32_t veracrypt_pim;/**< VeraCrypt Personal Iteration
> > Multiplier */
> > |^
> >
> >
> >
> >> Signed-off-by: Mingli Yu
> >> ---
> >> .../{cryptsetup_1.7.4.bb => cryptsetup_2.0.3.bb} | 12 +++-
> >> 1 file changed, 7 insertions(+), 5 deletions(-)
> >> rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_1.7.4.bb =>
> >> cryptsetup_2.0.3.bb} (72%)
> >>
> >> diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb
> >> b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb
> >> similarity index 72%
> >> rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb
> >> rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb
> >> index c13b764f7..df85add6a 100644
> >> --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb
> >> +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb
> >> @@ -4,16 +4,16 @@ device-mapper mappings. These include plain dm-crypt
> >> volumes and \
> >> LUKS volumes. The difference is that LUKS uses a metadata header \
> >> and can hence offer more features than plain dm-crypt. On the other \
> >> hand, the header is visible and vulnerable to damage."
> >> -HOMEPAGE = "http://code.google.com/p/cryptsetup/;
> >> +HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup;
> >> SECTION = "console"
> >> LICENSE = "GPL-2.0-with-OpenSSL-exception"
> >> LIC_FILES_CHKSUM =
> >> "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326"
> >> -DEPENDS = "util-linux libdevmapper popt libgcrypt"
> >> +DEPENDS = "util-linux libdevmapper popt libgcrypt json-c"
> >> -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz"
> >> -SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7"
> >> -SRC_URI[sha256sum] =
> >> "7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016"
> >> +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz"
> >> +SRC_URI[md5sum] = "ea1c722f8d4c4e36427628b679b1f819"
> >> +SRC_URI[sha256sum] =
> >> "4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4"
> >> inherit autotools gettext pkgconfig
> >> @@ -33,4 +33,6 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \
> >> EXTRA_OECONF = "--enable-static"
> >> +FILES_${PN} +=
> >> "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf',
> >> '', d)}"
> >> +
> >> BBCLASSEXTEND = "native nativesdk"
> >>
> >
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qfilesystemengine_unix.cpp: optionally disable use of statx(2)
On 2018-07-17 09:20, Martin Jansa wrote:
> On Mon, Jul 16, 2018 at 11:22:21AM +0200, Rasmus Villemoes wrote:
>> When used inside an unprivileged docker container, statx(2) gets
>> rejected with -EPERM by the default seccomp profile, unless the host
>> runs an almost-bleeding edge version of docker (at least 18.04). That
>> causes most qt apps, qmake in particular, to fail.
>> +
>> diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
>> index 09b6cc5..41f9b7a 100644
>> --- a/recipes-qt/qt5/qt5-git.inc
>> +++ b/recipes-qt/qt5/qt5-git.inc
>> @@ -15,3 +15,5 @@ CVE_PRODUCT = "qt"
>> S = "${WORKDIR}/git"
>>
>> PV = "5.11.1+git${SRCPV}"
>> +
>> +SRC_URI_append_no-xstat = "
>> file://0001-qfilesystemengine_unix.cpp-disable-use-of-statx-2.patch"
>
> Isn't this applicable only to *qtbase* ?
That is entirely likely. I have no idea which source files go into
building which qt modules, or if any source files are shared between
modules.
Rasmus
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] cryptsetup: Upgrade to 2.0.3
On 2018年07月17日 10:37, Khem Raj wrote:
On 7/16/18 6:58 PM, mingli...@windriver.com wrote:
From: Mingli Yu
* Update the homepage to https://gitlab.com/cryptsetup/cryptsetup
* Add json-c to DEPENDS as cryptsetup requires the
json-c library for JSON data processing since cryptsetup
2.0.0 per "The LUKS2 format and features" part of
https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.0-ReleaseNotes
* Add file /usr/lib/tmpfiles.d/cryptsetup.conf to
FILES_${PN} when systemd enabled in DISTRO_FEATURES
I am seeing a new failure for
meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb
| ../../../git/src/plugins/crypto.c: In function 'bd_crypto_tc_open':
| ../../../git/src/plugins/crypto.c:973:12: error: missing initializer
for field 'veracrypt_pim' of 'struct crypt_params_tcrypt'
[-Werror=missing-field-initializers]
| struct crypt_params_tcrypt params =
{NULL,0,NULL,0,NULL,NULL,NULL,0,0};
| ^~~
| In file included from ../../../git/src/plugins/crypto.c:22:
|
/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/libblockdev/2.16-r0/recipe-sysroot/usr/include/libcryptsetup.h:436:11:
Hi Khem,
The root cause for this failure is some API changed after cryptsetup
upgrade to 2.0.3 and libblockdev depends on cryptsetup and we should
also upgrade libblockdev accordingly.
And I notice there is already a patch with subject "[oe]
[PATCH][meta-oe] libblockdev: 2.16 -> 2.18" has already upgraded the
libblockdev to 2.18.
After upgrade to 2.18, the build failure for libblockdev which your saw
should be gone, so I think there is no need to resend V3 for cryptsetup.
What do you think?
Thanks,
note: 'veracrypt_pim' declared here
| uint32_t veracrypt_pim;/**< VeraCrypt Personal Iteration
Multiplier */
|^
Signed-off-by: Mingli Yu
---
.../{cryptsetup_1.7.4.bb => cryptsetup_2.0.3.bb} | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_1.7.4.bb =>
cryptsetup_2.0.3.bb} (72%)
diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb
b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb
similarity index 72%
rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb
rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb
index c13b764f7..df85add6a 100644
--- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb
+++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb
@@ -4,16 +4,16 @@ device-mapper mappings. These include plain dm-crypt
volumes and \
LUKS volumes. The difference is that LUKS uses a metadata header \
and can hence offer more features than plain dm-crypt. On the other \
hand, the header is visible and vulnerable to damage."
-HOMEPAGE = "http://code.google.com/p/cryptsetup/;
+HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup;
SECTION = "console"
LICENSE = "GPL-2.0-with-OpenSSL-exception"
LIC_FILES_CHKSUM =
"file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326"
-DEPENDS = "util-linux libdevmapper popt libgcrypt"
+DEPENDS = "util-linux libdevmapper popt libgcrypt json-c"
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz"
-SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7"
-SRC_URI[sha256sum] =
"7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz"
+SRC_URI[md5sum] = "ea1c722f8d4c4e36427628b679b1f819"
+SRC_URI[sha256sum] =
"4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4"
inherit autotools gettext pkgconfig
@@ -33,4 +33,6 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \
EXTRA_OECONF = "--enable-static"
+FILES_${PN} +=
"${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf',
'', d)}"
+
BBCLASSEXTEND = "native nativesdk"
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] vim: provide xxd
The xxd tool is quite useful by itself. For example, building U-boot
using the CONFIG_USE_DEFAULT_ENV_FILE option requires that the host
provides xxd, and it's nicer to be able to put xxd-native rather than
vim-native in that recipe's dependencies.
Signed-off-by: Rasmus Villemoes
---
meta-oe/recipes-support/vim/vim_8.1.0172.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-support/vim/vim_8.1.0172.bb
b/meta-oe/recipes-support/vim/vim_8.1.0172.bb
index 8e99919bd..b188c15c3 100644
--- a/meta-oe/recipes-support/vim/vim_8.1.0172.bb
+++ b/meta-oe/recipes-support/vim/vim_8.1.0172.bb
@@ -111,3 +111,5 @@ ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
ALTERNATIVE_PRIORITY = "100"
BBCLASSEXTEND = "native"
+
+PROVIDES += "xxd"
--
2.16.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] kselftest: Add a recipe on kernel selftest
Hi Raj,
I have try my best to reproduce your error, but I failed.
Could you help me to do the build in docker and share the dock image
with us. Or maybe you have a better method.
Thanks,
Hongzhi
On 2018年07月10日 12:11, Khem Raj wrote:
This is failing to build here
| DEBUG: Executing shell function do_compile
| NOTE: make -j 16 CROSS_COMPILE=x86_64-bec-linux- ARCH=x86
CC=x86_64-bec-linux-gcc -m64 -march=core2 -mtune=core2 -msse3
-mfpmath=sse -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security
--sysroot=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/recipe-sysroot
AR=x86_64-bec-linux-ar LD=x86_64-bec-linux-ld
--sysroot=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/recipe-sysroot
DESTDIR=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/image
-C
/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf
| make: Entering directory
'/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf'
| Makefile:19: *** recipe commences before first target. Stop.
| make: Leaving directory
'/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf'
| ERROR: oe_runmake failed
On Sat, Jul 7, 2018 at 11:05 PM Hongzhi.Song wrote:
The recipe builds the framework for kernel-selftest. Now, it just
contains two sets of testcase, bpf and vm. We are appending others
to the recipe.
It needs some features which will be written into relevant recipe.
But now, you should add them to conf/local.conf manually.
KERNEL_FEATURES_append += "features/bpf/bpf.scc"
Signed-off-by: Dengke Du
Signed-off-by: Hongzhi.Song
---
.../recipes-kernel/kselftest/kernel-selftest.bb| 94 ++
1 file changed, 94 insertions(+)
create mode 100644 meta-oe/recipes-kernel/kselftest/kernel-selftest.bb
diff --git a/meta-oe/recipes-kernel/kselftest/kernel-selftest.bb
b/meta-oe/recipes-kernel/kselftest/kernel-selftest.bb
new file mode 100644
index 000..6f20bd3
--- /dev/null
+++ b/meta-oe/recipes-kernel/kselftest/kernel-selftest.bb
@@ -0,0 +1,94 @@
+SUMMARY = "Kernel selftest for Linux"
+DESCRIPTION = "Kernel selftest for Linux"
+LICENSE = "GPLv2"
+
+# for bpf and vm
+DEPENDS = " \
+elfutils \
+libcap \
+libcap-ng \
+fuse \
+util-linux \
+rsync-native \
+"
+# for vm
+RDEPENDS_${PN} += "libgcc \
+ bash \
+"
+
+do_configure[depends] += "virtual/kernel:do_shared_workdir"
+
+inherit linux-kernel-base kernel-arch
+
+do_populate_lic[depends] += "virtual/kernel:do_patch"
+
+S = "${WORKDIR}/${BP}"
+
+# now we just test bpf and vm
+# we will append other kernel selftest in the future
+TEST_LIST = "bpf \
+ vm \
+"
+
+EXTRA_OEMAKE = '\
+CROSS_COMPILE=${TARGET_PREFIX} \
+ARCH=${ARCH} \
+CC="${CC}" \
+AR="${AR}" \
+LD="${LD}" \
+'
+
+EXTRA_OEMAKE += "\
+'DESTDIR=${D}' \
+"
+
+KERNEL_SELFTEST_SRC ?= "Makefile \
+include \
+tools \
+scripts \
+arch \
+"
+
+do_compile() {
+for i in ${TEST_LIST}
+do
+oe_runmake -C ${S}/tools/testing/selftests/${i}
+done
+}
+
+do_install() {
+for i in ${TEST_LIST}
+do
+oe_runmake -C ${S}/tools/testing/selftests/${i}
INSTALL_PATH=${D}/opt/kselftest/${i} install
+done
+
+chown root:root -R ${D}/opt/kselftest
+}
+
+do_configure() {
+:
+}
+
+do_configure[prefuncs] += "copy_kselftest_source_from_kernel
remove_clang_related"
+python copy_kselftest_source_from_kernel() {
+sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split()
+src_dir = d.getVar("STAGING_KERNEL_DIR")
+dest_dir = d.getVar("S")
+bb.utils.mkdirhier(dest_dir)
+for s in sources:
+src = oe.path.join(src_dir, s)
+dest = oe.path.join(dest_dir, s)
+if os.path.isdir(src):
+oe.path.copytree(src, dest)
+else:
+bb.utils.copyfile(src, dest)
+}
+
+remove_clang_related() {
+ sed -i -e '/test_pkt_access/d' -e '/test_pkt_md_access/d'
${S}/tools/testing/selftests/bpf/Makefile
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+INHIBIT_PACKAGE_DEBUG_SPLIT="1"
+FILES_${PN} += "/opt/kselftest/"
--
2.8.1
--
___
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] [PATCH][meta-oe] xf86-video-ati: 7.8.0 -> 18.0.1
From: Changqing Li
Signed-off-by: Changqing Li
---
.../{xf86-video-ati_7.8.0.bb => xf86-video-ati_18.0.1.bb} | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
rename meta-oe/recipes-graphics/xorg-driver/{xf86-video-ati_7.8.0.bb =>
xf86-video-ati_18.0.1.bb} (77%)
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_18.0.1.bb
similarity index 77%
rename from meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
rename to meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_18.0.1.bb
index fb81e53..969c1a0 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_18.0.1.bb
@@ -14,10 +14,12 @@ REQUIRED_DISTRO_FEATURES += "opengl"
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-SRC_URI[md5sum] = "f34d04a755e761e03b459155fa3ddcbb"
-SRC_URI[sha256sum] =
"401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa"
+SRC_URI[md5sum] = "40e7c0a5a69aba3d84e0958f58705ea7"
+SRC_URI[sha256sum] =
"72ea3b8127d4550b64f797457f5a7851a541fa4ee2cc3f345b6c1886b81714a0"
EXTRA_OECONF += "--disable-glamor"
RDEPENDS_${PN} += "xserver-xorg-module-exa"
RRECOMMENDS_${PN} += "linux-firmware-radeon"
+
+FILES_${PN} += "${datadir}/X11"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] udisks2: 2.7.6 -> 2.7.7
From: Changqing Li
Signed-off-by: Changqing Li
---
.../udisks2/0001-data-fix-out-of-tree-build.patch | 35 --
.../udisks/{udisks2_2.7.6.bb => udisks2_2.7.7.bb} | 3 +-
2 files changed, 1 insertion(+), 37 deletions(-)
delete mode 100644
meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch
rename meta-oe/recipes-support/udisks/{udisks2_2.7.6.bb => udisks2_2.7.7.bb}
(91%)
diff --git
a/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch
b/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch
deleted file mode 100644
index 1cbd877..000
---
a/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 7fdd4acdf6daf95c5cc74e968f4710513c8ddaea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?=
-Date: Fri, 23 Mar 2018 18:33:52 +0100
-Subject: [PATCH] data: fix out of tree build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| sed: can't read udisks2.service.in: No such file or directory
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/storaged-project/udisks/pull/510
-
-Signed-off-by: Andreas M??ller
- data/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/Makefile.am b/data/Makefile.am
-index ddf9e3d6..b38928c8 100644
a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -22,7 +22,7 @@ systemdservicedir = $(systemdsystemunitdir)
- systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
-
- $(systemdservice_DATA): udisks2.service.in Makefile
-- @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|"
udisks2.service.in > udisks2.service
-+ @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|"
$(srcdir)/udisks2.service.in > udisks2.service
- endif
-
- udevrulesdir = $(udevdir)/rules.d
---
-2.14.3
-
diff --git a/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb
b/meta-oe/recipes-support/udisks/udisks2_2.7.7.bb
similarity index 91%
rename from meta-oe/recipes-support/udisks/udisks2_2.7.6.bb
rename to meta-oe/recipes-support/udisks/udisks2_2.7.7.bb
index 4d22afd..ac86a69 100644
--- a/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb
+++ b/meta-oe/recipes-support/udisks/udisks2_2.7.7.bb
@@ -20,10 +20,9 @@ RDEPENDS_${PN} = "acl"
SRC_URI = " \
git://github.com/storaged-project/udisks.git \
-file://0001-data-fix-out-of-tree-build.patch \
file://non-gnu-libc.patch \
"
-SRCREV = "b6471f2e99f6aa1133af0de658f1fa05c748932c"
+SRCREV = "fcf888ca00980f75ce0c47041629b3d77e9f352e"
S = "${WORKDIR}/git"
CVE_PRODUCT = "udisks"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] python-pygobject: 3.28.0 -> 3.28.3
From: Changqing Li
Signed-off-by: Changqing Li
---
.../python/{python-pygobject_3.28.0.bb => python-pygobject_3.28.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-devtools/python/{python-pygobject_3.28.0.bb =>
python-pygobject_3.28.3.bb} (87%)
diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb
b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb
similarity index 87%
rename from meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb
rename to meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb
index ab65ba1..c444fbf 100644
--- a/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb
+++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb
@@ -17,8 +17,8 @@ SRC_URI = " \
file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \
"
-SRC_URI[md5sum] = "b29d69edb63ae1f555afeb19f90b9996"
-SRC_URI[sha256sum] =
"42b47b261b45aedfc77e02e3c90a01cd74d6f86c3273c1860a054d531d606e5a"
+SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90"
+SRC_URI[sha256sum] =
"3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0"
S = "${WORKDIR}/${SRCNAME}-${PV}"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe] pps-tools: 0.0.0+gitX -> 1.0.2
From: Changqing Li
Signed-off-by: Changqing Li
---
.../pps-tools/{pps-tools_git.bb => pps-tools_1.0.2.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta-oe/recipes-support/pps-tools/{pps-tools_git.bb =>
pps-tools_1.0.2.bb} (82%)
diff --git a/meta-oe/recipes-support/pps-tools/pps-tools_git.bb
b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb
similarity index 82%
rename from meta-oe/recipes-support/pps-tools/pps-tools_git.bb
rename to meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb
index 8bf9036..106be35 100644
--- a/meta-oe/recipes-support/pps-tools/pps-tools_git.bb
+++ b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb
@@ -4,12 +4,13 @@ HOMEPAGE = "http://linuxpps.org;
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PV = "0.0.0+git${SRCPV}"
-SRCREV = "0deb9c7e135e9380a6d09e9d2e938a146bb698c8"
+SRCREV = "cb48b7ecf7079ceba7081c78d4e61e507b0e8d2d"
SRC_URI = "git://github.com/ago/pps-tools.git"
S = "${WORKDIR}/git"
+RDEPENDS_pps-tools = "bash"
+
do_install() {
install -d ${D}${bindir} ${D}${includedir} \
${D}${includedir}/sys
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe] tclap: upgrade 1.2.1 -> 1.2.2
From: Changqing Li
License-Update: copyright year and owner update
Signed-off-by: Changqing Li
---
meta-oe/recipes-devtools/tclap/{tclap_1.2.1.bb => tclap_1.2.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-devtools/tclap/{tclap_1.2.1.bb => tclap_1.2.2.bb} (70%)
diff --git a/meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb
b/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb
similarity index 70%
rename from meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb
rename to meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb
index 3eadbe4..46a9408 100644
--- a/meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb
+++ b/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb
@@ -1,9 +1,9 @@
SUMMARY = "Templatized C++ Command Line Parser"
HOMEPAGE = "http://tclap.sourceforge.net/;
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c8ab0ff134bcc584d0e6b5b9f8732453"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0ca8b9c5c5445cfa7af7e78fd27e60ed"
-SRCREV = "3627d9402e529770df9b0edf2aa8c0e0d6c6bb41"
+SRCREV = "75f440bcac1276c847f5351e14216f6e91def44d"
SRC_URI = "git://git.code.sf.net/p/tclap/code \
file://Makefile.am-disable-docs.patch \
"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe] oprofile: 1.1.0 -> 1.1.2
From: Changqing Li
Signed-off-by: Changqing Li
---
meta-oe/recipes-kernel/oprofile/oprofile.inc | 5 ++-
.../0001-Fix-FTBFS-problem-with-GCC-6.patch| 51 --
.../0001-fix-musl-libc-compile-error.patch | 30 +
meta-oe/recipes-kernel/oprofile/oprofile_1.1.0.bb | 10 -
meta-oe/recipes-kernel/oprofile/oprofile_1.2.0.bb | 10 +
5 files changed, 43 insertions(+), 63 deletions(-)
delete mode 100644
meta-oe/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch
create mode 100644
meta-oe/recipes-kernel/oprofile/oprofile/0001-fix-musl-libc-compile-error.patch
delete mode 100644 meta-oe/recipes-kernel/oprofile/oprofile_1.1.0.bb
create mode 100644 meta-oe/recipes-kernel/oprofile/oprofile_1.2.0.bb
diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc
b/meta-oe/recipes-kernel/oprofile/oprofile.inc
index 4b01654..dabc30b 100644
--- a/meta-oe/recipes-kernel/oprofile/oprofile.inc
+++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc
@@ -25,12 +25,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz
\
file://run-ptest \
file://root-home-dir.patch \
file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \
- file://0001-Fix-FTBFS-problem-with-GCC-6.patch \
"
UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/"
UPSTREAM_CHECK_URI =
"https://sourceforge.net/projects/oprofile/files/oprofile/;
-SRC_URI_append_libc-musl = " file://musl.patch"
+SRC_URI_append_libc-musl = " file://musl.patch \
+ file://0001-fix-musl-libc-compile-error.patch \
+"
inherit autotools pkgconfig ptest
diff --git
a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch
b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch
deleted file mode 100644
index d372fd5..000
---
a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 39d4d46a0bd504ac708ffe72df87bf74cd12ad30 Mon Sep 17 00:00:00 2001
-From: William Cohen
-Date: Fri, 5 Feb 2016 17:30:19 -0500
-Subject: [PATCH] Fix FTBFS problem with GCC-6
-
-GCC-6 is pickier about some of the type conversions causing the Fedora
-24 mass rebuild the build of oprofile failed with:
-
-make[3]: Entering directory '/builddir/build/BUILD/oprofile-1.1.0/libutil++'
-g++ -DHAVE_CONFIG_H -I. -I.. -I ../libutil -I ../libop -I ../libpp -W -Wall
-fno-common -ftemplate-depth-50 -O2 -g -pipe -Wall -Werror=format-security
-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong
--param=ssp-buffer-size=4 -grecord-gcc-switches
-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m32 -march=i686 -mtune=atom
-fasynchronous-unwind-tables -c -o op_bfd.o op_bfd.cpp
-op_bfd.cpp: In member function 'void op_bfd::get_symbol_range(symbol_index_t,
long long unsigned int&, long long unsigned int&) const':
-op_bfd.cpp:538:47: error: cannot convert 'std::ostream {aka
std::basic_ostream}' to 'const bool' in initialization
- bool const verbose = cverb << (vbfd & vlevel1);
- ^
-op_bfd.cpp:546:7: error: in argument to unary !
- if (!verbose)
- ^~~
-
-Avoid the intermediate bool type to make GCC-6 happy.
-
-Signed-off-by: William Cohen
-Upstream-Status: Backport
-
- libutil++/op_bfd.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/libutil++/op_bfd.cpp b/libutil++/op_bfd.cpp
-index 389c920..f2eb42b 100644
a/libutil++/op_bfd.cpp
-+++ b/libutil++/op_bfd.cpp
-@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(symbol_index_t sym_idx,
- {
- op_bfd_symbol const & sym = syms[sym_idx];
-
-- bool const verbose = cverb << (vbfd & vlevel1);
--
- if (anon_obj)
- start = sym.vma();
- else
- start = sym.filepos();
- end = start + sym.size();
-
-- if (!verbose)
-+ if (!(cverb << (vbfd & vlevel1)))
- return;
-
- io_state state(cverb << (vbfd & vlevel1));
---
-1.9.1
-
diff --git
a/meta-oe/recipes-kernel/oprofile/oprofile/0001-fix-musl-libc-compile-error.patch
b/meta-oe/recipes-kernel/oprofile/oprofile/0001-fix-musl-libc-compile-error.patch
new file mode 100644
index 000..c21a105
--- /dev/null
+++
b/meta-oe/recipes-kernel/oprofile/oprofile/0001-fix-musl-libc-compile-error.patch
@@ -0,0 +1,30 @@
+From 512f1b3a4727a3a18f8fa55f196eedcacdd4a872 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Wed, 18 Jul 2018 13:01:03 +0800
+Subject: [PATCH] fix musl libc compile error
+
+use op_basename instead of basename to fix below error:
+../../oprofile-1.2.0/pp/oparchive.cpp:264:20: error: 'basename'
+was not declared in this scope
+
+Signed-off-by: Changqing Li
+---
+ pp/oparchive.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pp/oparchive.cpp b/pp/oparchive.cpp
+index 6221e14..274152b 100644
+--- a/pp/oparchive.cpp
[oe] [PATCH][meta-oe] mm-common: 0.9.11 -> 0.9.12
From: Changqing Li Signed-off-by: Changqing Li --- meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb | 9 - meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb | 9 + 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb create mode 100644 meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb diff --git a/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb b/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb deleted file mode 100644 index 591caa7..000 --- a/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb +++ /dev/null @@ -1,9 +0,0 @@ -inherit gnomebase - -SRC_URI[archive.md5sum] = "d6f2a43589480d2315672da0b5839b56" -SRC_URI[archive.sha256sum] = "20d1e7466ca4c83c92e29f9e8dfcc8e5721fdf1337f53157bed97be3b73b32a8" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb b/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb new file mode 100644 index 000..4f91f31 --- /dev/null +++ b/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb @@ -0,0 +1,9 @@ +inherit gnomebase + +SRC_URI[archive.md5sum] = "be1c61587db989c7677375a729b94672" +SRC_URI[archive.sha256sum] = "ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +BBCLASSEXTEND = "native" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe] numactl: 2.0.11 -> 2.0.12
From: Changqing Li
License-Update: license file name updated
format changed, but most content is remain
add mail of related person.
Signed-off-by: Changqing Li
---
.../numactl/0001-fix-NULL-pointer-problem.patch| 35 ++
.../numactl/numactl/fix-null-pointer.patch | 28 -
meta-oe/recipes-support/numactl/numactl_git.bb | 8 ++---
3 files changed, 39 insertions(+), 32 deletions(-)
create mode 100644
meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch
delete mode 100644
meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch
diff --git
a/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch
b/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch
new file mode 100644
index 000..0497613
--- /dev/null
+++
b/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch
@@ -0,0 +1,35 @@
+From 5c16beff9909b28f55f25f48ed7ddbf98d8b1d5c Mon Sep 17 00:00:00 2001
+From: Roy Li
+Date: Wed, 18 Jul 2018 09:43:55 +0800
+Subject: [PATCH] fix NULL pointer problem
+
+return 0 if distance_table is NULL
+
+Upstream-Status: Pending
+
+read_distance_table() maybe return 0, but distance_table is not set,
+if distance_table is used, and will lead to SEGFAULT
+
+Signed-off-by: Roy Li
+
+Signed-off-by: Changqing Li
+---
+ distance.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/distance.c b/distance.c
+index 8d472af..6a6e886 100644
+--- a/distance.c
b/distance.c
+@@ -113,6 +113,8 @@ int numa_distance(int a, int b)
+ int err = read_distance_table();
+ if (err < 0)
+ return 0;
++ if(!distance_table)
++ return 0;
+ }
+ if ((unsigned)a >= distance_numnodes || (unsigned)b >=
distance_numnodes)
+ return 0;
+--
+2.7.4
+
diff --git a/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch
b/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch
deleted file mode 100644
index 53952ae..000
--- a/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-[PATCH] return 0 if distance_table is NULL
-
-Upstream-Status: Pending
-
-read_distance_table() maybe return 0, but distance_table is not set,
-if distance_table is used, and will lead to SEGFAULT
-
-Signed-off-by: Roy Li
- distance.c |2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/distance.c b/distance.c
-index 4a26972..c6ca021 100755
a/distance.c
-+++ b/distance.c
-@@ -113,6 +113,8 @@ int numa_distance(int a, int b)
- int err = read_distance_table();
- if (err < 0)
- return 0;
-+ if (!distance_table)
-+ return 0;
- }
- return distance_table[a * distance_numnodes + b];
- }
---
-1.7.10.4
-
diff --git a/meta-oe/recipes-support/numactl/numactl_git.bb
b/meta-oe/recipes-support/numactl/numactl_git.bb
index b9cbcf0..c1c3879 100644
--- a/meta-oe/recipes-support/numactl/numactl_git.bb
+++ b/meta-oe/recipes-support/numactl/numactl_git.bb
@@ -9,13 +9,13 @@ RDEPENDS_${PN} = "perl"
inherit autotools-brokensep ptest
-LIC_FILES_CHKSUM =
"file://README;beginline=19;endline=32;md5=5644cc3851cb2499f6c48e52fe198bd9"
+LIC_FILES_CHKSUM =
"file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb"
-SRCREV = "ea3a70681c2f523fe58e1d44527f478ca76db74e"
-PV = "2.0.11+git${SRCPV}"
+SRCREV = "841253d1313b01a968c380cae4f498f20c46e5aa"
+PV = "2.0.12+git${SRCPV}"
SRC_URI = "git://github.com/numactl/numactl \
-file://fix-null-pointer.patch \
+file://0001-fix-NULL-pointer-problem.patch \
file://Fix-the-test-output-format.patch \
file://Makefile \
file://run-ptest \
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe] libblockdev: 2.16 -> 2.18
From: Changqing Li
Signed-off-by: Changqing Li
---
.../0001-fix-configure-and-compile-failures.patch | 64 --
.../{libblockdev_2.16.bb => libblockdev_2.18.bb} | 12 ++--
2 files changed, 41 insertions(+), 35 deletions(-)
rename meta-oe/recipes-extended/libblockdev/{libblockdev_2.16.bb =>
libblockdev_2.18.bb} (81%)
diff --git
a/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch
b/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch
index 745883e..9c050b7 100644
---
a/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch
+++
b/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch
@@ -1,7 +1,7 @@
-From 86686ccbf43c5d9e8c8dc97c66ba09e522050e5e Mon Sep 17 00:00:00 2001
+From 21654e3719e0a289e735918b234f7aae6766e3a1 Mon Sep 17 00:00:00 2001
From: Hongxu Jia
-Date: Thu, 27 Jul 2017 10:06:24 +0800
-Subject: [PATCH 1/3] fix configure and compile failures
+Date: Wed, 18 Jul 2018 11:26:28 +0800
+Subject: [PATCH] fix configure and compile failures
1. Fix do_configure failure
---
@@ -9,9 +9,6 @@ Subject: [PATCH 1/3] fix configure and compile failures
../tmp/6tvtK.c:1:38: fatal error: volume_key/libvolume_key.h:
No such file or directory
| #include
-|Checking header dmraid/dmraid.h existence and usability.../tmp/
-ktVJ6.c:1:27: fatal error: dmraid/dmraid.h: No such file or directory
-| #include
---
We explictly add volume_key and dmraid to DEPENDS, do not need
configure to test.
@@ -28,12 +25,20 @@ autoheader: Use AC_DEFINE([LIBMOUNT_NEW_ERR_API], [],
[Description])
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia
+
+Checking header dmraid/dmraid.h existence and usability.../tmp/
+ktVJ6.c:1:27: fatal error: dmraid/dmraid.h: No such file or directory
+| #include
+
+fix this by add --disable-dmraid
+
+Signed-off-by: Changqing Li
---
- configure.ac | 10 --
- 1 file changed, 4 insertions(+), 6 deletions(-)
+ configure.ac | 12 +++-
+ 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
-index d41a307..b036e04 100644
+index a37f337..a8cfe2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,8 @@ AC_DISABLE_STATIC
@@ -45,35 +50,38 @@ index d41a307..b036e04 100644
AM_PATH_PYTHON
AM_PROG_AR
-@@ -154,7 +156,6 @@ LIBBLOCKDEV_PKG_CHECK_MODULES([KMOD], [libkmod >= 19])
+@@ -194,10 +196,9 @@ LIBBLOCKDEV_PKG_CHECK_MODULES([KMOD], [libkmod >= 19])
AS_IF([test "x$with_crypto" != "xno"],
[LIBBLOCKDEV_PKG_CHECK_MODULES([CRYPTSETUP], [libcryptsetup >= 1.6.7])
-LIBBLOCKDEV_PKG_CHECK_MODULES([NSS], [nss >= 3.18.0])
-- LIBBLOCKDEV_CHECK_HEADER([volume_key/libvolume_key.h], [$GLIB_CFLAGS
$NSS_CFLAGS], [libvolume_key.h not available])
+ AS_IF([$PKG_CONFIG --atleast-version=2.0 libcryptsetup],
+-[AC_DEFINE([LIBCRYPTSETUP_2])], [])
++[AC_DEFINE([LIBCRYPTSETUP_2], [1], [new version of
libcryptsetup])])
+ AS_IF([test "x$with_escrow" != "xno"],
+-[LIBBLOCKDEV_PKG_CHECK_MODULES([NSS], [nss >= 3.18.0])
+- LIBBLOCKDEV_CHECK_HEADER([volume_key/libvolume_key.h],
[$GLIB_CFLAGS $NSS_CFLAGS], [libvolume_key.h not available])],
++[LIBBLOCKDEV_PKG_CHECK_MODULES([NSS], [nss >= 3.18.0])],
+ [])
],
[])
-
-@@ -162,10 +163,6 @@ AS_IF([test "x$with_dm" != "xno" -o "x$with_lvm" != "xno"
-o "x$with_lvm_dbus" !
- [LIBBLOCKDEV_PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= 1.02.93])],
- [])
-
--AS_IF([test "x$with_dm" != "xno"],
-- [LIBBLOCKDEV_CHECK_HEADER([dmraid/dmraid.h], [], [dmraid.h not
available])],
-- [])
--
- AS_IF([test "x$with_part" != "xno" -o "x$with_fs" != "xno"],
- [LIBBLOCKDEV_PKG_CHECK_MODULES([PARTED], [libparted >= 3.1])]
- [])
-@@ -174,7 +171,8 @@ AS_IF([test "x$with_fs" != "xno"],
+@@ -218,7 +219,8 @@ AS_IF([test "x$with_fs" != "xno"],
[LIBBLOCKDEV_PKG_CHECK_MODULES([MOUNT], [mount >= 2.23.0])
# new versions of libmount has some new functions we can use
AS_IF([$PKG_CONFIG --atleast-version=2.30.0 mount],
- [AC_DEFINE([LIBMOUNT_NEW_ERR_API])], [])
-+ [AC_DEFINE([LIBMOUNT_NEW_ERR_API], [1], [new versions of
libmount has some new functions we can use])],
-+ [])
++ [AC_DEFINE([LIBMOUNT_NEW_ERR_API], [1], [new versions of libmount has
some new functions we can use])],
++ [])
LIBBLOCKDEV_PKG_CHECK_MODULES([BLKID], [blkid >= 2.23.0])
# older versions of libblkid don't support BLKID_SUBLKS_BADCSUM so
let's just
+@@ -243,7 +245,7 @@ AS_IF([test "x$with_nvdimm" != "xno"],
+LIBBLOCKDEV_PKG_CHECK_MODULES([NDCTL], [libndctl >= 58.4])
+# new versions of libndctl new modes
+AS_IF([$PKG_CONFIG --atleast-version=60 libndctl],
+-
