[oe] [meta-oe] [PATCH] hwdata: upgrade 0.326 -> 0.327

2019-09-05 Thread Zang Ruochen
Signed-off-by: Zang Ruochen 
---
 meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb 
b/meta-oe/recipes-support/hwdata/hwdata_git.bb
index 198a771..e661020 100644
--- a/meta-oe/recipes-support/hwdata/hwdata_git.bb
+++ b/meta-oe/recipes-support/hwdata/hwdata_git.bb
@@ -5,8 +5,8 @@ SECTION = "System/Base"
 LICENSE = "GPL-2.0+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
 
-PV = "0.326"
-SRCREV = "dc8574c8e01ac758ba4dd23e7574492e261ad9ea"
+PV = "0.327"
+SRCREV = "874f7831c64de7ea2203cfcd1b3fc336bc27e468"
 SRC_URI = "git://github.com/vcrhonek/${BPN}.git"
 
 S = "${WORKDIR}/git"
-- 
2.7.4



-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-perl] [PATCH] libnet-dns-perl: upgrade 1.20 -> 1.21

2019-09-05 Thread Zang Ruochen
Signed-off-by: Zang Ruochen 
---
 .../libnet/{libnet-dns-perl_1.20.bb => libnet-dns-perl_1.21.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-perl/recipes-perl/libnet/{libnet-dns-perl_1.20.bb => 
libnet-dns-perl_1.21.bb} (92%)

diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.20.bb 
b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.21.bb
similarity index 92%
rename from meta-perl/recipes-perl/libnet/libnet-dns-perl_1.20.bb
rename to meta-perl/recipes-perl/libnet/libnet-dns-perl_1.21.bb
index c37b40d..58b8eec 100644
--- a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.20.bb
+++ b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.21.bb
@@ -9,8 +9,8 @@ DEPENDS += "perl"
 
 SRC_URI = 
"http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz";
 
-SRC_URI[md5sum] = "565d3ae163591f3da7e1a20827b73c28"
-SRC_URI[sha256sum] = 
"7fd9692b687253baa8f2eb639f1dd7ff9c77fddd67167dc59b400bd25e4ce01b"
+SRC_URI[md5sum] = "91e8593eb6eed41995e6edc567fb6fec"
+SRC_URI[sha256sum] = 
"ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a"
 
 UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P(\d+\.\d+))(?!_\d+).tar"
 
-- 
2.7.4



-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-python] [PATCH] python-paste: upgrade 3.1.1 -> 3.2.0

2019-09-05 Thread Zang Ruochen
Signed-off-by: Zang Ruochen 
---
 .../python/{python-paste_3.1.1.bb => python-paste_3.2.0.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-python/recipes-devtools/python/{python-paste_3.1.1.bb => 
python-paste_3.2.0.bb} (71%)

diff --git a/meta-python/recipes-devtools/python/python-paste_3.1.1.bb 
b/meta-python/recipes-devtools/python/python-paste_3.2.0.bb
similarity index 71%
rename from meta-python/recipes-devtools/python/python-paste_3.1.1.bb
rename to meta-python/recipes-devtools/python/python-paste_3.2.0.bb
index 90e7970..92a97d1 100644
--- a/meta-python/recipes-devtools/python/python-paste_3.1.1.bb
+++ b/meta-python/recipes-devtools/python/python-paste_3.2.0.bb
@@ -5,8 +5,8 @@ RDEPENDS_${PN} = "python-six"
 
 LIC_FILES_CHKSUM = 
"file://docs/license.txt;md5=1798f29d55080c60365e6283cb49779c"
 
-SRC_URI[md5sum] = "07132313bc62c7525402d31119161228"
-SRC_URI[sha256sum] = 
"baca402a089594db0cf1e9aae5c98bcf91588bbbaf848527257e246b960eb72f"
+SRC_URI[md5sum] = "9225991c1c37a81e0aaac2fb046f3602"
+SRC_URI[sha256sum] = 
"2153da2f1b09a69bce7633d7e3f9aaa802572e85f9ac1ed09ad93ef8599d31b6"
 
 PYPI_PACKAGE = "Paste"
 inherit pypi setuptools
-- 
2.7.4



-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-filesystems][PATCH V2] xfsdump: support usrmerge

2019-09-05 Thread changqing.li
From: Changqing Li 

Signed-off-by: Changqing Li 
---
 .../files/0001-xfsdump-support-usrmerge.patch  | 48 ++
 .../recipes-utils/xfsdump/xfsdump_3.1.8.bb |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 
meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch

diff --git 
a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
 
b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
new file mode 100644
index 000..04ec7b3
--- /dev/null
+++ 
b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
@@ -0,0 +1,48 @@
+From 2da4cfe17b994d7f10017561ca8efe6b6bd5f3cf Mon Sep 17 00:00:00 2001
+From: Changqing Li 
+Date: Thu, 5 Sep 2019 11:17:15 +0800
+Subject: [PATCH] xfsdump: support usrmerge
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li 
+---
+ dump/Makefile| 4 +---
+ restore/Makefile | 4 +---
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/dump/Makefile b/dump/Makefile
+index 97879fa..14da664 100644
+--- a/dump/Makefile
 b/dump/Makefile
+@@ -97,10 +97,8 @@ default: depend $(LTCOMMAND)
+ include $(BUILDRULES)
+ 
+ install: default
+-  $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
+-  $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
+   $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+-  $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) 
$(PKG_SBIN_DIR)/$(LTCOMMAND)
++  $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
+ install-dev:
+ 
+ .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
+diff --git a/restore/Makefile b/restore/Makefile
+index c6f3f25..7835ecc 100644
+--- a/restore/Makefile
 b/restore/Makefile
+@@ -107,10 +107,8 @@ default: depend $(LTCOMMAND)
+ include $(BUILDRULES)
+ 
+ install: default
+-  $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
+-  $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
+   $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+-  $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) 
$(PKG_SBIN_DIR)/$(LTCOMMAND)
++  $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
+ install-dev:
+ 
+ .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
+-- 
+2.7.4
+
diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb 
b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
index 0421aa0..9c57558 100644
--- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
+++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
@@ -13,6 +13,7 @@ DEPENDS = "xfsprogs attr"
 SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \
file://remove-install-as-user.patch \
file://work-with-new-version-of-xfsprogs.patch \
+   
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)}
 \
"
 SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7"
 SRC_URI[sha256sum] = 
"ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585"
-- 
2.7.4

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][Patch] libwacom: add recipe

2019-09-05 Thread Kang Kai

On 2019/9/6 上午9:10, Khem Raj wrote:

On 9/4/19 6:51 PM, Kang Kai wrote:

On 2019/8/29 下午4:29, kai.k...@windriver.com wrote:

From: Kai Kang 

Package libinput has a package config 'libwacom'. When it is set,
package libwacom is required. So add the recipe of libwacom.

Add a patch to generate udev rules file on target that it is not
suitable for cross compile.


fails to build

https://errors.yoctoproject.org/Errors/Details/268566/

https://errors.yoctoproject.org/Errors/Details/268387/


Thanks. I'll check them.

Kai






Ping.



Signed-off-by: Kai Kang 
---
   .../generate-udev-rules-on-target.patch   | 59 +++
   .../recipes-extended/libwacom/libwacom_1.0.bb | 17 ++
   2 files changed, 76 insertions(+)
   create mode 100644
meta-oe/recipes-extended/libwacom/libwacom/generate-udev-rules-on-target.patch
   create mode 100644 meta-oe/recipes-extended/libwacom/libwacom_1.0.bb

diff --git
a/meta-oe/recipes-extended/libwacom/libwacom/generate-udev-rules-on-target.patch
b/meta-oe/recipes-extended/libwacom/libwacom/generate-udev-rules-on-target.patch

new file mode 100644
index 0..27e037c98
--- /dev/null
+++
b/meta-oe/recipes-extended/libwacom/libwacom/generate-udev-rules-on-target.patch
@@ -0,0 +1,59 @@
+libwacom create a native executable file to generate udev rules
file. But it is
+not suitable for cross compile. And it is complicate to create
libwacom-native
+that libgudev-native and udev-native are required.
+
+So do not generate udev rules file during compilation. Install the
executable
+file to generate udev rules on target. It should put the generated
rules file
+at /lib/udev/rules.d/65-libwacom.rules.
+
+Upstream-Status: Inappropriate [cross-compile specific]
+
+Signed-off-by: Kai Kang 
+---
+diff --git a/meson.build b/meson.build
+index 6584c86..4009f5f 100644
+--- a/meson.build
 b/meson.build
+@@ -407,20 +407,20 @@ executable('libwacom-list-local-devices',
+    include_directories: [includes_src],
+    install: true)
+
+-tools_cflags = ['-DTOPSRCDIR="@0@"'.format(meson.source_root())]
++tools_cflags = ['-DTOPSRCDIR="@0@"'.format(meson.source_root()),
'-DLIBWACOM_DATA_DIR="@0@"'.format(dir_data)]
+
+-gen_udev_rules = executable('generate-udev-rules',
++gen_udev_rules = executable('libwacom-generate-udev-rules',
+ 'tools/generate-udev-rules.c',
+ dependencies: [dep_libwacom, dep_glib],
+ include_directories: [includes_src],
+ c_args: tools_cflags,
+-    install: false)
+-custom_target('udev-rules',
+-  command: gen_udev_rules,
+-  capture: true,
+-  output: '65-libwacom.rules',
+-  install: true,
+-  install_dir: join_paths(dir_udev, 'rules.d'))
++    install: true)
++#custom_target('udev-rules',
++#  command: gen_udev_rules,
++#  capture: true,
++#  output: '65-libwacom.rules',
++#  install: true,
++#  install_dir: join_paths(dir_udev, 'rules.d'))
+
+ executable('list-devices',
+    'tools/list-devices.c',
+diff --git a/tools/generate-udev-rules.c b/tools/generate-udev-rules.c
+index bb00e7b..fbf49f0 100644
+--- a/tools/generate-udev-rules.c
 b/tools/generate-udev-rules.c
+@@ -229,7 +229,7 @@ int main(int argc, char **argv)
+ }
+
+
+-    db = libwacom_database_new_for_path(TOPSRCDIR"/data");
++    db = libwacom_database_new_for_path(LIBWACOM_DATA_DIR);
+
+ list = libwacom_list_devices_from_database(db, NULL);
+ if (!list) {
diff --git a/meta-oe/recipes-extended/libwacom/libwacom_1.0.bb
b/meta-oe/recipes-extended/libwacom/libwacom_1.0.bb
new file mode 100644
index 0..0787ad246
--- /dev/null
+++ b/meta-oe/recipes-extended/libwacom/libwacom_1.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "libwacom is a library to identify wacom tablets and
their model-specific features."
+HOMEPAGE = "https://github.com/linuxwacom/libwacom/wiki";
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM =
"file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e"
+
+DEPENDS = "libgudev libxml2"
+
+SRC_URI = "git://github.com/linuxwacom/libwacom.git;protocol=https \
+   file://generate-udev-rules-on-target.patch \
+   "
+SRCREV = "ae6c9cf78802844349986ac2a708d87e891a3e6e"
+
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig




--
Kai Kang

--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH v2] remmina: Add recipe for the remmina remote desktop client

2019-09-05 Thread Khem Raj
we might need to add libexecinfo to DEPENDS on musl see

https://errors.yoctoproject.org/Errors/Details/268552/

can you take a look ?

On 9/4/19 3:57 PM, Alejandro Hernandez wrote:
> Remmina has become one of the most widely used RDP clients,
> it uses freeRDP 2.0 as a backend and also supports multiple
> network protocols like RSP, VNC, SPICE, NX, and SSH.
>
> Signed-off-by: Alejandro Enedino Hernandez Samaniego 
> ---
>  meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 28 
> 
>  1 file changed, 28 insertions(+)
>  create mode 100644 meta-oe/recipes-support/remmina/remmina_1.3.6.bb
>
> diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb 
> b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
> new file mode 100644
> index 000..a14a259
> --- /dev/null
> +++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
> @@ -0,0 +1,28 @@
> +DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+"
> +HOMEPAGE = "https://remmina.org";
> +SECTION = "Support"
> +LICENSE = "GPLv2 & openssl"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f 
> file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769"
> +DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui 
> libsodium libssh vte json-glib libsoup-2.4 libvncserver spice spice-protocol 
> libsecret"
> +
> +SRC_URI = 
> "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \
> +"
> +SRC_URI[md5sum] = "6da599c3a5cab2df37a70f8fba2f5438"
> +SRC_URI[sha256sum] = 
> "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea556af1a"
> +
> +S = "${WORKDIR}/Remmina-v${PV}"
> +
> +inherit cmake
> +
> +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF 
> -DWITH_TRANSLATIONS=OFF"
> +
> +do_install_append(){
> +# We dont need the extra stuff form other desktop environments
> +rm -rf ${D}/${datadir}/xsessions
> +rm -rf ${D}/${datadir}/metainfo
> +rm -rf ${D}/${datadir}/gnome-session
> +}
> +
> +RDEPENDS_${PN} = "bash"
> +
> +FILES_${PN}_append = " ${datadir}/icons/hicolor/*"
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][Patch] libwacom: add recipe

2019-09-05 Thread Khem Raj

On 9/4/19 6:51 PM, Kang Kai wrote:
> On 2019/8/29 下午4:29, kai.k...@windriver.com wrote:
>> From: Kai Kang 
>>
>> Package libinput has a package config 'libwacom'. When it is set,
>> package libwacom is required. So add the recipe of libwacom.
>>
>> Add a patch to generate udev rules file on target that it is not
>> suitable for cross compile.


fails to build

https://errors.yoctoproject.org/Errors/Details/268566/

https://errors.yoctoproject.org/Errors/Details/268387/


>
> Ping.
>
>
>> Signed-off-by: Kai Kang 
>> ---
>>   .../generate-udev-rules-on-target.patch   | 59 +++
>>   .../recipes-extended/libwacom/libwacom_1.0.bb | 17 ++
>>   2 files changed, 76 insertions(+)
>>   create mode 100644
>> meta-oe/recipes-extended/libwacom/libwacom/generate-udev-rules-on-target.patch
>>   create mode 100644 meta-oe/recipes-extended/libwacom/libwacom_1.0.bb
>>
>> diff --git
>> a/meta-oe/recipes-extended/libwacom/libwacom/generate-udev-rules-on-target.patch
>> b/meta-oe/recipes-extended/libwacom/libwacom/generate-udev-rules-on-target.patch
>>
>> new file mode 100644
>> index 0..27e037c98
>> --- /dev/null
>> +++
>> b/meta-oe/recipes-extended/libwacom/libwacom/generate-udev-rules-on-target.patch
>> @@ -0,0 +1,59 @@
>> +libwacom create a native executable file to generate udev rules
>> file. But it is
>> +not suitable for cross compile. And it is complicate to create
>> libwacom-native
>> +that libgudev-native and udev-native are required.
>> +
>> +So do not generate udev rules file during compilation. Install the
>> executable
>> +file to generate udev rules on target. It should put the generated
>> rules file
>> +at /lib/udev/rules.d/65-libwacom.rules.
>> +
>> +Upstream-Status: Inappropriate [cross-compile specific]
>> +
>> +Signed-off-by: Kai Kang 
>> +---
>> +diff --git a/meson.build b/meson.build
>> +index 6584c86..4009f5f 100644
>> +--- a/meson.build
>>  b/meson.build
>> +@@ -407,20 +407,20 @@ executable('libwacom-list-local-devices',
>> +    include_directories: [includes_src],
>> +    install: true)
>> +
>> +-tools_cflags = ['-DTOPSRCDIR="@0@"'.format(meson.source_root())]
>> ++tools_cflags = ['-DTOPSRCDIR="@0@"'.format(meson.source_root()),
>> '-DLIBWACOM_DATA_DIR="@0@"'.format(dir_data)]
>> +
>> +-gen_udev_rules = executable('generate-udev-rules',
>> ++gen_udev_rules = executable('libwacom-generate-udev-rules',
>> + 'tools/generate-udev-rules.c',
>> + dependencies: [dep_libwacom, dep_glib],
>> + include_directories: [includes_src],
>> + c_args: tools_cflags,
>> +-    install: false)
>> +-custom_target('udev-rules',
>> +-  command: gen_udev_rules,
>> +-  capture: true,
>> +-  output: '65-libwacom.rules',
>> +-  install: true,
>> +-  install_dir: join_paths(dir_udev, 'rules.d'))
>> ++    install: true)
>> ++#custom_target('udev-rules',
>> ++#  command: gen_udev_rules,
>> ++#  capture: true,
>> ++#  output: '65-libwacom.rules',
>> ++#  install: true,
>> ++#  install_dir: join_paths(dir_udev, 'rules.d'))
>> +
>> + executable('list-devices',
>> +    'tools/list-devices.c',
>> +diff --git a/tools/generate-udev-rules.c b/tools/generate-udev-rules.c
>> +index bb00e7b..fbf49f0 100644
>> +--- a/tools/generate-udev-rules.c
>>  b/tools/generate-udev-rules.c
>> +@@ -229,7 +229,7 @@ int main(int argc, char **argv)
>> + }
>> +
>> +
>> +-    db = libwacom_database_new_for_path(TOPSRCDIR"/data");
>> ++    db = libwacom_database_new_for_path(LIBWACOM_DATA_DIR);
>> +
>> + list = libwacom_list_devices_from_database(db, NULL);
>> + if (!list) {
>> diff --git a/meta-oe/recipes-extended/libwacom/libwacom_1.0.bb
>> b/meta-oe/recipes-extended/libwacom/libwacom_1.0.bb
>> new file mode 100644
>> index 0..0787ad246
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/libwacom/libwacom_1.0.bb
>> @@ -0,0 +1,17 @@
>> +DESCRIPTION = "libwacom is a library to identify wacom tablets and
>> their model-specific features."
>> +HOMEPAGE = "https://github.com/linuxwacom/libwacom/wiki";
>> +SECTION = "libs"
>> +
>> +LICENSE = "MIT"
>> +LIC_FILES_CHKSUM =
>> "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e"
>> +
>> +DEPENDS = "libgudev libxml2"
>> +
>> +SRC_URI = "git://github.com/linuxwacom/libwacom.git;protocol=https \
>> +   file://generate-udev-rules-on-target.patch \
>> +   "
>> +SRCREV = "ae6c9cf78802844349986ac2a708d87e891a3e6e"
>> +
>> +S = "${WORKDIR}/git"
>> +
>> +inherit meson pkgconfig
>
>
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-webserver][Patch 1/2] apache2: fix multilib file conflicts

2019-09-05 Thread kai.kang
From: Kai Kang 

There are errors of apache2 about files conflicts when multilib enabled:

| Error: Transaction check error:
|   file /etc/apache2/extra/httpd-ssl.conf conflicts between attempted installs 
of lib32-apache2-2.4.41-r0.core2_32 and apache2-2.4.41-r0.core2_64
|   file /etc/apache2/httpd.conf conflicts between attempted installs of 
lib32-apache2-2.4.41-r0.core2_32 and apache2-2.4.41-r0.core2_64
|   file /usr/sbin/envvars conflicts between attempted installs of 
lib32-apache2-2.4.41-r0.core2_32 and apache2-2.4.41-r0.core2_64
|   file /usr/sbin/envvars-std conflicts between attempted installs of 
lib32-apache2-2.4.41-r0.core2_32 and apache2-2.4.41-r0.core2_64

It makes libexecdir point to ${libdir}. Reset to ${libexecdir} which could
eliminate file conflicts of the conf files. And remove /usr/sbin/envvars and
/usr/sbin/envvars-std which only used by apachectl. They only add standard
library path ${libdir} to LD_LIBRARY_PATH, so remove them to avoid multilib
file conflicts.

Signed-off-by: Kai Kang 
---
 meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb 
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb
index a8da7e227..a34734c20 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb
@@ -53,7 +53,7 @@ EXTRA_OECONF_class-target = "\
 --sysconfdir=${sysconfdir}/${BPN} \
 --datadir=${datadir}/${BPN} \
 --libdir=${libdir} \
---libexecdir=${libdir}/${BPN}/modules \
+--libexecdir=${libexecdir}/${BPN}/modules \
 --localstatedir=${localstatedir} \
 --enable-ssl \
 --with-dbm=sdbm \
@@ -78,7 +78,7 @@ EXTRA_OECONF_class-native = "\
 "
 
 do_configure_prepend() {
-sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-bin:g' 
${S}/config.layout
+sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' 
${S}/config.layout
 }
 
 do_install_append_class-target() {
@@ -139,7 +139,7 @@ do_install_append_class-target() {
 install -m 0644 ${WORKDIR}/volatiles.04_apache2 
${D}${sysconfdir}/default/volatiles/04_apache2
 fi
 
-rm -rf ${D}${localstatedir}
+rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars*
 chown -R root:root ${D}
 }
 
-- 
2.17.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-oe][Patch 2/2] php: sync with apache2's change

2019-09-05 Thread kai.kang
From: Kai Kang 

It redefines apache2's libexecdir. Update php to sync with that change.

Signed-off-by: Kai Kang 
---
 meta-oe/recipes-devtools/php/php.inc | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-devtools/php/php.inc 
b/meta-oe/recipes-devtools/php/php.inc
index 4c0617c49..d738d2d93 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -172,10 +172,8 @@ do_install_append_class-target() {
 done
 
 if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; 
then
-install -d ${D}${libdir}/apache2/modules
 install -d ${D}${sysconfdir}/apache2/modules.d
 install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}
-install -m 755  libs/libphp${PHP_MAJOR_VERSION}.so 
${D}${libdir}/apache2/modules
 install -m 644  ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf 
${D}${sysconfdir}/apache2/modules.d
 sed -i s,lib/,${libdir}/, 
${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf
 cat ${S}/php.ini-production | \
@@ -211,7 +209,7 @@ INITSCRIPT_PACKAGES = "${PN}-fpm"
 inherit update-rc.d
 
 FILES_${PN}-dbg =+ "${bindir}/.debug \
-${libdir}/apache2/modules/.debug"
+${libexecdir}/apache2/modules/.debug"
 FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc"
 FILES_${PN}-cli = "${bindir}/php"
 FILES_${PN}-phar = "${bindir}/phar*"
@@ -237,7 +235,7 @@ FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build 
${bindir}/phpize \
 FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a"
 FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}"
 FILES_${PN} = "${PHP_LIBDIR}/php"
-FILES_${PN} += "${bindir}"
+FILES_${PN} += "${bindir} ${libexecdir}/apache2"
 
 SUMMARY_${PN}-modphp = "PHP module for the Apache HTTP server"
 FILES_${PN}-modphp = "${libdir}/apache2 ${sysconfdir}"
-- 
2.17.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-webserver/oe][Patch 0/2] Redefine libexecdir to fix apache2

2019-09-05 Thread kai.kang
From: Kai Kang 

Build with
1 echo 'IMAGE_INSTALL_append = " apache2"' >>conf/local.conf
2 bitbake core-image-sato-sdk
3 runqemu qemumips64 nographic 


root@qemumips64:~# systemctl status apache2
* apache2.service - The Apache HTTP Server
   Loaded: loaded (/lib/systemd/system/apache2.service; enabled; vendor preset: 
enabled)
   Active: active (running) since Thu 2019-09-05 22:29:59 UTC; 45s ago
 Main PID: 178 (httpd)
Tasks: 82 (limit: 546)
   Memory: 7.0M
   CGroup: /system.slice/apache2.service
   |-178 /usr/sbin/httpd -DFOREGROUND -D SSL -D PHP5 -k start
   |-192 /usr/sbin/httpd -DFOREGROUND -D SSL -D PHP5 -k start
   |-193 /usr/sbin/httpd -DFOREGROUND -D SSL -D PHP5 -k start
   `-194 /usr/sbin/httpd -DFOREGROUND -D SSL -D PHP5 -k start

Sep 05 22:29:59 qemumips64 systemd[1]: Started The Apache HTTP Server.
root@qemumips64:~# systemctl stop apache2
root@qemumips64:~# systemctl status apache2
* apache2.service - The Apache HTTP Server
   Loaded: loaded (/lib/systemd/system/apache2.service; enabled; vendor preset: 
enabled)
   Active: inactive (dead) since Thu 2019-09-05 22:30:56 UTC; 4s ago
  Process: 178 ExecStart=/usr/sbin/httpd -DFOREGROUND -D SSL -D PHP5 -k start 
(code=exited, status=0/SUCCESS)
  Process: 341 ExecStop=/bin/kill -WINCH ${MAINPID} (code=exited, 
status=0/SUCCESS)
 Main PID: 178 (code=exited, status=0/SUCCESS)

Sep 05 22:29:59 qemumips64 systemd[1]: Started The Apache HTTP Server.
Sep 05 22:30:51 qemumips64 systemd[1]: Stopping The Apache HTTP Server...
Sep 05 22:30:56 qemumips64 systemd[1]: apache2.service: Succeeded.
Sep 05 22:30:56 qemumips64 systemd[1]: Stopped The Apache HTTP Server.
root@qemumips64:~# systemctl start apache2
root@qemumips64:~# systemctl status apache2
* apache2.service - The Apache HTTP Server
   Loaded: loaded (/lib/systemd/system/apache2.service; enabled; vendor preset: 
enabled)
   Active: active (running) since Thu 2019-09-05 22:31:15 UTC; 2s ago
 Main PID: 348 (httpd)
Tasks: 82 (limit: 546)
   Memory: 5.2M
   CGroup: /system.slice/apache2.service
   |-348 /usr/sbin/httpd -DFOREGROUND -D SSL -D PHP5 -k start
   |-349 /usr/sbin/httpd -DFOREGROUND -D SSL -D PHP5 -k start
   |-350 /usr/sbin/httpd -DFOREGROUND -D SSL -D PHP5 -k start
   `-351 /usr/sbin/httpd -DFOREGROUND -D SSL -D PHP5 -k start

root@qemumips64:~# curl localhost
It works!




Kai Kang (2):
  apache2: fix multilib file conflicts
  php: sync with apache2's change

 meta-oe/recipes-devtools/php/php.inc   | 6 ++
 meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

-- 
2.17.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


Re: [oe] [meta-filesystems][PATCH] xfsdump: support usrmerge

2019-09-05 Thread Khem Raj
this fails in a non usrmerge case e.g.

https://errors.yoctoproject.org/Errors/Details/268439/

On Wed, Sep 4, 2019 at 11:01 PM  wrote:
>
> From: Changqing Li 
>
> Signed-off-by: Changqing Li 
> ---
>  .../files/0001-xfsdump-support-usrmerge.patch  | 48 
> ++
>  .../recipes-utils/xfsdump/xfsdump_3.1.8.bb |  2 +-
>  2 files changed, 49 insertions(+), 1 deletion(-)
>  create mode 100644 
> meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
>
> diff --git 
> a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
>  
> b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
> new file mode 100644
> index 000..04ec7b3
> --- /dev/null
> +++ 
> b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch
> @@ -0,0 +1,48 @@
> +From 2da4cfe17b994d7f10017561ca8efe6b6bd5f3cf Mon Sep 17 00:00:00 2001
> +From: Changqing Li 
> +Date: Thu, 5 Sep 2019 11:17:15 +0800
> +Subject: [PATCH] xfsdump: support usrmerge
> +
> +Upstream-Status: Inappropriate [oe-specific]
> +
> +Signed-off-by: Changqing Li 
> +---
> + dump/Makefile| 4 +---
> + restore/Makefile | 4 +---
> + 2 files changed, 2 insertions(+), 6 deletions(-)
> +
> +diff --git a/dump/Makefile b/dump/Makefile
> +index 97879fa..14da664 100644
> +--- a/dump/Makefile
>  b/dump/Makefile
> +@@ -97,10 +97,8 @@ default: depend $(LTCOMMAND)
> + include $(BUILDRULES)
> +
> + install: default
> +-  $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
> +-  $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
> +   $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
> +-  $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) 
> $(PKG_SBIN_DIR)/$(LTCOMMAND)
> ++  $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
> + install-dev:
> +
> + .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
> +diff --git a/restore/Makefile b/restore/Makefile
> +index c6f3f25..7835ecc 100644
> +--- a/restore/Makefile
>  b/restore/Makefile
> +@@ -107,10 +107,8 @@ default: depend $(LTCOMMAND)
> + include $(BUILDRULES)
> +
> + install: default
> +-  $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
> +-  $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
> +   $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
> +-  $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) 
> $(PKG_SBIN_DIR)/$(LTCOMMAND)
> ++  $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
> + install-dev:
> +
> + .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
> +--
> +2.7.4
> +
> diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb 
> b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
> index 0421aa0..9c8e78e 100644
> --- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
> +++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
> @@ -12,7 +12,7 @@ DEPENDS = "xfsprogs attr"
>
>  SRC_URI = 
> "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \
> file://remove-install-as-user.patch \
> -   file://work-with-new-version-of-xfsprogs.patch \
> +   
> ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)}
>  \
> "
>  SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7"
>  SRC_URI[sha256sum] = 
> "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585"
> --
> 2.7.4
>
> --
> ___
> 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] nano: update to 4.4

2019-09-05 Thread Oleksandr Kravchuk
Signed-off-by: Oleksandr Kravchuk 
---
 meta-oe/recipes-support/nano/{nano_4.3.bb => nano_4.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/nano/{nano_4.3.bb => nano_4.4.bb} (79%)

diff --git a/meta-oe/recipes-support/nano/nano_4.3.bb 
b/meta-oe/recipes-support/nano/nano_4.4.bb
similarity index 79%
rename from meta-oe/recipes-support/nano/nano_4.3.bb
rename to meta-oe/recipes-support/nano/nano_4.4.bb
index aa773bf75..18121be06 100644
--- a/meta-oe/recipes-support/nano/nano_4.3.bb
+++ b/meta-oe/recipes-support/nano/nano_4.4.bb
@@ -12,8 +12,8 @@ RDEPENDS_${PN} = "ncurses-terminfo-base"
 PV_MAJOR = "${@d.getVar('PV').split('.')[0]}"
 
 SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz";
-SRC_URI[md5sum] = "23f4f7b5c0d1f04ad555960dc294f2b8"
-SRC_URI[sha256sum] = 
"00d3ad1a287a85b4bf83e5f06cedd0a9f880413682bebd52b4b1e2af8cfc0d81"
+SRC_URI[md5sum] = "9650dd3eb0adbab6aaa748a6f1398ccb"
+SRC_URI[sha256sum] = 
"2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7"
 
 inherit autotools gettext pkgconfig
 
-- 
2.17.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][thud][PATCH v3] libedit: Add native and nativesdk to BBCLASSEXTEND

2019-09-05 Thread Maxime Roussin-Bélanger
ping

On Sun, Aug 25, 2019 at 11:30 PM Maxime Roussin-Bélanger <
maxime.roussinbelan...@gmail.com> wrote:

> To keep support of meta-clang support on thud branch.
> It depends on libedit native
>
> Signed-off-by: Maxime Roussin-Bélanger 
> ---
> Changes in v2:
> - Add missing meta-oe in subject
> Changes in v3:
> - Add missing signoff
>
> meta-oe/recipes-devtools/libedit/libedit_20180525-3.1.bb | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/meta-oe/recipes-devtools/libedit/libedit_20180525-3.1.bb
> b/meta-oe/recipes-devtools/libedit/libedit_20180525-3.1.bb
> index 8cc0e959e0..60f4f5a22b 100644
> --- a/meta-oe/recipes-devtools/libedit/libedit_20180525-3.1.bb
> +++ b/meta-oe/recipes-devtools/libedit/libedit_20180525-3.1.bb
> @@ -19,3 +19,5 @@ SRC_URI[md5sum] = "97679319742f45d6cdcd6075511b14ac"
>  SRC_URI[sha256sum] =
> "c41bea8fd140fb57ba67a98ec1d8ae0b8ffa82f4aba9c35a87e5a9499e653116"
>
>  S = "${WORKDIR}/${BPN}-${PV}"
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.20.1
>
>
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [PATCH] drbd-utils: switch to add patch from change source in do_configure

2019-09-05 Thread changqing.li
From: Changqing Li 

it is not proper change source in do_configure, it will make
source not updated even local.conf have change the DISTRO_FEATURES

[YOCTO: #13493]

Signed-off-by: Changqing Li 
---
 .../0001-drbd-utils-support-usrmerge.patch | 108 +
 .../recipes-support/drbd/drbd-utils_9.10.0.bb  |  12 +--
 2 files changed, 109 insertions(+), 11 deletions(-)
 create mode 100644 
meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch

diff --git 
a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
 
b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
new file mode 100644
index 000..5e12872
--- /dev/null
+++ 
b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
@@ -0,0 +1,108 @@
+From 642b5823abeee27a0fdc2d12d0e1235461ace9ed Mon Sep 17 00:00:00 2001
+From: Changqing Li 
+Date: Thu, 5 Sep 2019 18:57:39 +0800
+Subject: [PATCH] drbd-utils: support usrmerge
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: Changqing Li 
+---
+ configure.ac |  2 +-
+ scripts/Makefile.in  |  4 ++--
+ user/v83/Makefile.in | 14 +++---
+ user/v84/Makefile.in | 14 +++---
+ 4 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4df1b4d..c4ef1bc 100644
+--- a/configure.ac
 b/configure.ac
+@@ -176,7 +176,7 @@ AC_ARG_WITH(tmpfilesdir,
+ AC_SUBST(tmpfilesdir)
+ 
+ # set default early
+-default_udevdir=/lib/udev
++default_udevdir=${prefix}/lib/udev
+ if test x"$with_udev" = x || \
+test x"$with_udev" = xyes ; then
+   if test x"$PKG_CONFIG" != x; then
+diff --git a/scripts/Makefile.in b/scripts/Makefile.in
+index fbb0beb..da701a1 100644
+--- a/scripts/Makefile.in
 b/scripts/Makefile.in
+@@ -75,8 +75,8 @@ endif
+ ifeq ($(subst both,systemd,$(initscripttype)),systemd)
+   install -d $(DESTDIR)$(systemdunitdir)
+   install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/
+-  install -d $(DESTDIR)/lib/drbd/
+-  install -m 755 drbd $(DESTDIR)/lib/drbd/
++  install -d $(DESTDIR)/${nonarch_libdir}/drbd
++  install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd
+   install -d $(DESTDIR)$(tmpfilesdir)/
+   install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf
+ endif
+diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in
+index 27516de..b301376 100644
+--- a/user/v83/Makefile.in
 b/user/v83/Makefile.in
+@@ -96,19 +96,19 @@ install:
+ ifeq ($(WITH_83_SUPPORT),yes)
+   install -d $(DESTDIR)$(localstatedir)/lib/drbd
+   install -d $(DESTDIR)$(localstatedir)/lock
+-  install -d $(DESTDIR)/lib/drbd/
++  install -d $(DESTDIR)/${nonarch_libdir}/drbd/
+   if getent group haclient > /dev/null 2> /dev/null ; then
\
+-  install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; 
\
+-  install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ;
\
++  install -g haclient -m 4750 drbdsetup-83 
$(DESTDIR)/${nonarch_libdir}/drbd/ ;   \
++  install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ;  
\
+   else
\
+-  install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ;  
\
+-  install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ;
\
++  install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ 
;\
++  install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ;  
\
+   fi
+ endif
+ 
+ uninstall:
+-  rm -f $(DESTDIR)/lib/drbd/drbdsetup-83
+-  rm -f $(DESTDIR)/lib/drbd/drbdadm-83
++  rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83
++  rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83
+ 
+ .PHONY: install uninstall clean distclean
+ ../../configure:
+diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in
+index 38977c6..05ef060 100644
+--- a/user/v84/Makefile.in
 b/user/v84/Makefile.in
+@@ -109,19 +109,19 @@ ifeq ($(WITH_84_SUPPORT),yes)
+   install -d $(DESTDIR)$(localstatedir)/lib/drbd
+   install -d $(DESTDIR)$(localstatedir)/run/drbd
+   install -d $(DESTDIR)$(localstatedir)/lock
+-  install -d $(DESTDIR)/lib/drbd/
++  install -d $(DESTDIR)/${nonarch_libdir}/drbd/
+   if getent group haclient > /dev/null 2> /dev/null ; then\
+-  install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; 
\
+-  install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ;
\
++  install -g haclient -m 4750 drbdsetup-84 
$(DESTDIR)/${nonarch_libdir}/drbd/ ;   \
++  install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ;  
\
+   else\
+-  install -m 755 drbdsetup-84 $(DESTDIR)/l

[oe] [meta-python] [PATCH] python-pyasn1: upgrade 0.4.6 -> 0.4.7

2019-09-05 Thread Yuan Chao
Signed-off-by: Yuan Chao 
---
 meta-python/recipes-devtools/python/python-pyasn1.inc | 4 ++--
 .../python/{python-pyasn1_0.4.6.bb => python-pyasn1_0.4.7.bb} | 0
 .../{python3-pyasn1_0.4.6.bb => python3-pyasn1_0.4.7.bb}  | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-python/recipes-devtools/python/{python-pyasn1_0.4.6.bb => 
python-pyasn1_0.4.7.bb} (100%)
 rename meta-python/recipes-devtools/python/{python3-pyasn1_0.4.6.bb => 
python3-pyasn1_0.4.7.bb} (100%)

diff --git a/meta-python/recipes-devtools/python/python-pyasn1.inc 
b/meta-python/recipes-devtools/python/python-pyasn1.inc
index 1086f30bf..014fcf9a3 100644
--- a/meta-python/recipes-devtools/python/python-pyasn1.inc
+++ b/meta-python/recipes-devtools/python/python-pyasn1.inc
@@ -3,8 +3,8 @@ HOMEPAGE = "http://pyasn1.sourceforge.net/";
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=a14482d15c2249de3b6f0e8a47e021fd"
 
-SRC_URI[md5sum] = "67f1da0cf680761d29169e54e7d53159"
-SRC_URI[sha256sum] = 
"b773d5c9196ffbc3a1e13bdf909d446cad80a039aa3340bcad72f395b76ebc86"
+SRC_URI[md5sum] = "50290e833395016c49903f4f9c7e47e5"
+SRC_URI[sha256sum] = 
"a9495356ca1d66ed197a0f72b41eb1823cf7ea8b5bd07191673e8147aecf8604"
 
 RDEPENDS_${PN}_class-target += " \
 ${PYTHON_PN}-codecs \
diff --git a/meta-python/recipes-devtools/python/python-pyasn1_0.4.6.bb 
b/meta-python/recipes-devtools/python/python-pyasn1_0.4.7.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python-pyasn1_0.4.6.bb
rename to meta-python/recipes-devtools/python/python-pyasn1_0.4.7.bb
diff --git a/meta-python/recipes-devtools/python/python3-pyasn1_0.4.6.bb 
b/meta-python/recipes-devtools/python/python3-pyasn1_0.4.7.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-pyasn1_0.4.6.bb
rename to meta-python/recipes-devtools/python/python3-pyasn1_0.4.7.bb
-- 
2.17.1



-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-python] [PATCH] python-pbr: upgrade 5.4.2 -> 5.4.3

2019-09-05 Thread Yuan Chao
Signed-off-by: Yuan Chao 
---
 .../python/{python-pbr_5.4.2.bb => python-pbr_5.4.3.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-python/recipes-devtools/python/{python-pbr_5.4.2.bb => 
python-pbr_5.4.3.bb} (62%)

diff --git a/meta-python/recipes-devtools/python/python-pbr_5.4.2.bb 
b/meta-python/recipes-devtools/python/python-pbr_5.4.3.bb
similarity index 62%
rename from meta-python/recipes-devtools/python/python-pbr_5.4.2.bb
rename to meta-python/recipes-devtools/python/python-pbr_5.4.3.bb
index 1023b2031..b21722fda 100644
--- a/meta-python/recipes-devtools/python/python-pbr_5.4.2.bb
+++ b/meta-python/recipes-devtools/python/python-pbr_5.4.3.bb
@@ -2,8 +2,8 @@ inherit setuptools
 # The inc file is in oe-core
 require recipes-devtools/python/python-pbr.inc
 
-SRC_URI[md5sum] = "ea90e1118a0132da752d45e68d10b2b8"
-SRC_URI[sha256sum] = 
"9b321c204a88d8ab5082699469f52cc94c5da45c51f114113d01b3d993c24cdf"
+SRC_URI[md5sum] = "477d2aa285ad97250a172b199f4060b7"
+SRC_URI[sha256sum] = 
"2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8"
 
 do_install_append() {
 if [ -f ${D}${bindir}/pbr ]; then
-- 
2.17.1



-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-python] [PATCH] python-dbus: upgrade 1.2.8 -> 1.2.10

2019-09-05 Thread Yuan Chao
License File dbus-gmain/COPYING content changed:
Add SPDX-License-Identifier.

Signed-off-by: Yuan Chao 
---
 .../python/{python-dbus_1.2.8.bb => python-dbus_1.2.10.bb}  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-python/recipes-devtools/python/{python-dbus_1.2.8.bb => 
python-dbus_1.2.10.bb} (83%)

diff --git a/meta-python/recipes-devtools/python/python-dbus_1.2.8.bb 
b/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb
similarity index 83%
rename from meta-python/recipes-devtools/python/python-dbus_1.2.8.bb
rename to meta-python/recipes-devtools/python/python-dbus_1.2.10.bb
index b3f724054..9907ea953 100644
--- a/meta-python/recipes-devtools/python/python-dbus_1.2.8.bb
+++ b/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb
@@ -3,14 +3,14 @@ SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus";
 LICENSE = "MIT & AFL-2.1 | GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b03240518994df6d8c974675675e5ca4 \
-   
file://dbus-gmain/COPYING;md5=05c3eacd50f69bb1d58afec460baad57 "
+   
file://dbus-gmain/COPYING;md5=99fece6728a80737c8fd3e7c734c17c4 "
 DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
 
 SRC_URI = 
"http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
 "
 
-SRC_URI[md5sum] = "7379db774c10904f27e7e2743d90fb43"
-SRC_URI[sha256sum] = 
"abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f"
+SRC_URI[md5sum] = "5d21d5ae6423f0e41caa3400af44edac"
+SRC_URI[sha256sum] = 
"d4332bbd4a0054fa4010b259c293b84d461bbd9d7a8ef528157d151c0398d886"
 S = "${WORKDIR}/dbus-python-${PV}"
 
 inherit distutils-base autotools pkgconfig
-- 
2.17.1



-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel