dtc: upgrade to 1.4.6

PATCH In review Alexander Kanavin 2 participants 11 messages May 17, 2018 – May 23, 2018 Arm/Amlogic Meson SoC support

lore

Share & tools

lore

Alexander Kanavin

author

2018-05-17 11:46 UTC #0 lore raw

PATCH 1/10 dtc: upgrade to 1.4.6

Drop upstreamed patch.

Signed-off-by Alexander Kanavin <[email protected]>

---
 meta/recipes-kernel/dtc/dtc.inc               |  1 -
 ...se-proper-format-modifier-for-size_t.patch | 43 -------------------
 .../dtc/{dtc_1.4.5.bb => dtc_1.4.6.bb}        |  2 +-
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
 rename meta/recipes-kernel/dtc/{dtc_1.4.5.bb => dtc_1.4.6.bb} (81%)

meta/recipes-kernel/dtc/dtc.inc +0 -1

index 9a90d440416..7a923bf5206 100644
@@ -7,7 +7,6 @@ DEPENDS = "flex-native bison-native"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
            file://make_install.patch \
-           file://0001-checks-Use-proper-format-modifier-for-size_t.patch \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"

meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch deleted +0 ~~-43~~

43 lines not on this page · raw message

meta/recipes-kernel/dtc/dtc_1.4.6.bb renamed from meta/recipes-kernel/dtc/dtc_1.4.5.bb +1 -1

similarity index 81%
rename from meta/recipes-kernel/dtc/dtc_1.4.5.bb
rename to meta/recipes-kernel/dtc/dtc_1.4.6.bb
index 0e46cfbeb4f..78c57363926 100644
@@ -3,7 +3,7 @@ require dtc.inc
 LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
 		    file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
 
-SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
+SRCREV = "e54388015af1fb4bf04d0bca99caba1074d9cc42"
 
 S = "${WORKDIR}/git"

Signature · 1 line

2.17.0

Alexander Kanavin

author

2018-05-17 11:46 UTC #1 lore raw

PATCH 2/10 xz: fix upstream version check

Signed-off-by Alexander Kanavin <[email protected]>

---
 meta/recipes-extended/xz/xz_5.2.3.bb | 1 +
 1 file changed, 1 insertion(+)

meta/recipes-extended/xz/xz_5.2.3.bb +1 -0

index 65168920d1d..8d7f0f19943 100644
@@ -24,6 +24,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
 SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
 SRC_URI[md5sum] = "ef68674fb47a8b8e741b34e429d86e9d"
 SRC_URI[sha256sum] = "71928b357d0a09a12a4b4c5fafca8c31c19b0e7d3b8ebb19622e96f26dbf28cb"
+UPSTREAM_CHECK_REGEX = "xz-(?P<pver>\d+(\.\d+)+)\.tar"
 
 inherit autotools gettext

Signature · 1 line

2.17.0

Alexander Kanavin

author

2018-05-17 11:46 UTC #2 lore raw

PATCH 3/10 babeltrace: fix upstream version check

In reply to Alexander Kanavin

Signed-off-by Alexander Kanavin <[email protected]>

---
 meta/recipes-kernel/lttng/babeltrace_1.5.5.bb | 1 +
 1 file changed, 1 insertion(+)

meta/recipes-kernel/lttng/babeltrace_1.5.5.bb +1 -0

index 2a2fa1e5b1d..b247fb0f9b6 100644
@@ -9,6 +9,7 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
 
 SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5"
 SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)$"
 
 S = "${WORKDIR}/git"

Signature · 1 line

2.17.0

Alexander Kanavin

author

2018-05-17 11:46 UTC #3 lore raw

PATCH 4/10 gnome-desktop3: remove the recipe

In reply to Alexander Kanavin

Epiphany no longer needs it, nothing else does,
and so it will be moved to meta-oe.

Signed-off-by Alexander Kanavin <[email protected]>

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 .../epiphany/epiphany_3.28.1.1.bb             |  2 +-
 ...ibseccomp-sycall-filtering-mechanism.patch | 45 --------------
 ...humbnail-don-t-assume-time_t-is-long.patch | 61 -------------------
 .../gnome-desktop/gnome-desktop3_3.28.1.bb    | 28 ---------
 5 files changed, 1 insertion(+), 136 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
 delete mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch
 delete mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb

meta/conf/distro/include/maintainers.inc +0 -1

index 7787a2c1378..6d6c148de88 100644
@@ -206,7 +206,6 @@ RECIPE_MAINTAINER_pn-glide = "Otavio Salvador <[email protected]>
 RECIPE_MAINTAINER_pn-gmp = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-gnome-common = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-gnome-desktop-testing = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-gnome-desktop3 = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-gnome-doc-utils = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-gnome-themes-standard = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-gnu-config = "Robert Yang <[email protected]>"

meta/recipes-gnome/epiphany/epiphany_3.28.1.1.bb +1 -1

index 490d0f6a9c8..d6f8eda902e 100644
@@ -3,7 +3,7 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \
-	   gsettings-desktop-schemas gnome-desktop3 libxml2-native \
+	   gsettings-desktop-schemas libxml2-native \
 	   glib-2.0 glib-2.0-native json-glib"
 
 GNOMEBASEBUILDCLASS = "meson"

meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch deleted +0 ~~-45~~

45 lines not on this page · raw message

meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch deleted +0 ~~-61~~

61 lines not on this page · raw message

meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb deleted +0 ~~-28~~

deleted file mode 100644
index 39b3491fdb1..00000000000
@@ -1,28 +0,0 @@
-SUMMARY = "GNOME library for reading .desktop files"
-SECTION = "x11/gnome"
-LICENSE = "GPLv2 & LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-
-BPN = "gnome-desktop"
-
-inherit gnome pkgconfig upstream-version-is-even gobject-introspection
-SRC_URI[archive.md5sum] = "bcbf906d94eb08060c60a7364384d678"
-SRC_URI[archive.sha256sum] = "78a397a2be47586e6dc075d6a7fc5659aae3d10713d76994ce1b46086e7ecb9a"
-
-SRC_URI += " \
-           file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
-           file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \
-           "
-
-DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
-
-inherit distro_features_check gtk-doc
-REQUIRED_DISTRO_FEATURES = "x11"
-
-EXTRA_OECONF = "--disable-desktop-docs"
-
-PACKAGES =+ "libgnome-desktop3"
-FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml"
-
-RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas"

Signature · 1 line

2.17.0

Alexander Kanavin

author

2018-05-17 11:46 UTC #4 lore raw

PATCH 5/10 libidn: upgrade 1.34 -> 1.35

In reply to Alexander Kanavin

Add autoconf-archive dependency to expand AC_JAVA_OPTIONS and other java-related macros.

Signed-off-by Alexander Kanavin <[email protected]>

---
 .../libidn/libidn/libidn_fix_for_automake-1.12.patch      | 8 ++++----
 .../libidn/{libidn_1.34.bb => libidn_1.35.bb}             | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename meta/recipes-extended/libidn/{libidn_1.34.bb => libidn_1.35.bb} (89%)

meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch +4 -4

index 5d03810d006..3c0559e34f4 100644
@@ -1,4 +1,4 @@
-From c34c7aba769bff3e483f89145055b9b8733435f3 Mon Sep 17 00:00:00 2001
+From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001
 From: Nitin A Kamble <[email protected]>
 Date: Wed, 2 May 2012 18:05:19 -0700
 Subject: [PATCH] libtasn1: fix build with automake 1.12

@@ -19,11 +19,11 @@ Signed-off-by: Nitin A Kamble <[email protected]>
  1 file changed, 4 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index f8049a4..261dad2 100644
+index 8297649..7b9626e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 17)
- AC_SUBST(LT_REVISION, 18)
+@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18)
+ AC_SUBST(LT_REVISION, 0)
  AC_SUBST(LT_AGE, 6)
  
 +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it

meta/recipes-extended/libidn/libidn_1.35.bb renamed from meta/recipes-extended/libidn/libidn_1.34.bb +3 -3

similarity index 89%
rename from meta/recipes-extended/libidn/libidn_1.34.bb
rename to meta/recipes-extended/libidn/libidn_1.35.bb
index 424c6c9f981..d5ce5b46bd3 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \
                     file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
                     file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \
                     file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e"
-DEPENDS = "virtual/libiconv"
+DEPENDS = "virtual/libiconv autoconf-archive"
 
 inherit pkgconfig autotools gettext texinfo gtk-doc

@@ -21,8 +21,8 @@ SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
            file://0001-idn-format-security-warnings.patch \
            "
 
-SRC_URI[md5sum] = "a829db6cd0b85733017c20a50bf10798"
-SRC_URI[sha256sum] = "3719e2975f2fb28605df3479c380af2cf4ab4e919e1506527e4c7670afff6e3c"
+SRC_URI[md5sum] = "bef634141fe39326cb354b75e891fead"
+SRC_URI[sha256sum] = "f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e"
 
 # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3
 # so package command into a separate package

Signature · 1 line

2.17.0

Alexander Kanavin

author

2018-05-17 11:46 UTC #5 lore raw

PATCH 6/10 btrfs-tools: upgrade 4.15.1 -> 4.16.1

In reply to Alexander Kanavin

Drop upstreamed patch.

Add a patch to correctly set LDFLAGS for one of the libraries and Python bindings.

Add dependencies to build Python bindings
(directly inheriting setuptools3 class does not work, as the build is Makefile-managed) and a snippet to install them.

Signed-off-by Alexander Kanavin <[email protected]>

---
 ...DFLAGS-when-building-libbtrfsutil.so.patch | 35 ++++++++++
 .../btrfs-tools/ftw-subdir-walk.patch         | 69 -------------------
 ...-tools_4.15.1.bb => btrfs-tools_4.16.1.bb} | 12 ++--
 3 files changed, 43 insertions(+), 73 deletions(-)
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/ftw-subdir-walk.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.15.1.bb => btrfs-tools_4.16.1.bb} (78%)

meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch new file +35 -0

new file mode 100644
index 00000000000..a8fcfc0f73c
@@ -0,0 +1,35 @@
+From eecc48ecad359cd4fab650ce49cfe57e99d1859d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 17 May 2018 12:21:31 +0300
+Subject: [PATCH] Add LDFLAGS when building libbtrfsutil.so and python
+ bindings.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 10f0e3b0..1697794c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -402,7 +402,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c
+ 
+ libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects)
+ 	@echo "    [LD]     $@"
+-	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) \
++	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(LDFLAGS) $(libbtrfsutil_objects) \
+ 		-shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@
+ 
+ libbtrfsutil.a: $(libbtrfsutil_objects)
+@@ -417,7 +417,7 @@ ifeq ($(PYTHON_BINDINGS),1)
+ libbtrfsutil_python: libbtrfsutil.so.$(libbtrfsutil_major) libbtrfsutil.so libbtrfsutil/btrfsutil.h
+ 	@echo "    [PY]     libbtrfsutil"
+ 	$(Q)cd libbtrfsutil/python; \
+-		CFLAGS= LDFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build
++		CFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build
+ 
+ .PHONY: libbtrfsutil_python
+ endif

meta/recipes-devtools/btrfs-tools/btrfs-tools/ftw-subdir-walk.patch deleted +0 ~~-69~~

69 lines not on this page · raw message

meta/recipes-devtools/btrfs-tools/btrfs-tools_4.16.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb +8 -4

similarity index 78%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.16.1.bb
index f7ea27321cf..18f11ba89e3 100644
@@ -10,17 +10,17 @@ HOMEPAGE = "https://btrfs.wiki.kernel.org"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
 SECTION = "base"
-DEPENDS = "util-linux attr e2fsprogs lzo acl"
+DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "3097f02c948f69f520c565ff8f8ba476aa6edb88"
+SRCREV = "f7fc27cb20924cc340a2a522655969253dd97ae9"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Makefile-build-mktables-using-native-gcc.patch \
-           file://ftw-subdir-walk.patch \
+           file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
            "
 
-inherit autotools-brokensep pkgconfig manpages
+inherit autotools-brokensep pkgconfig manpages distutils3-base
 
 CLEANBROKEN = "1"

@@ -36,4 +36,8 @@ do_configure_prepend() {
 
 S = "${WORKDIR}/git"
 
+do_install_append() {
+    oe_runmake 'DESTDIR=${D}' install_python
+}
+
 BBCLASSEXTEND = "native"

Signature · 1 line

2.17.0

Burton, Ross

2018-05-23 14:01 UTC #6 lore raw

Re: [PATCH 06/10] btrfs-tools: upgrade 4.15.1 -> 4.16.1

Breaks with multilib and other setups with odd $libdir.

ERROR: btrfs-tools-4.16.1-r0 do_package: QA Issue: btrfs-tools:
Files/directories were installed but not shipped in any package:
/usr/lib/python3.5/site-packages/btrfsutil.cpython-35m-x86_64-linux-gnu.so /usr/lib/python3.5/site-packages/btrfsutil-1.0.0-py3.5.egg-info /usr/lib/python3.5/site-packages/btrfsutil-1.0.0-py3.5.egg-info/dependency_links.txt /usr/lib/python3.5/site-packages/btrfsutil-1.0.0-py3.5.egg-info/top_level.txt /usr/lib/python3.5/site-packages/btrfsutil-1.0.0-py3.5.egg-info/PKG-INFO /usr/lib/python3.5/site-packages/btrfsutil-1.0.0-py3.5.egg-info/SOURCES.txt

Ross

Quoted 180 lines · Alexander Kanavin

Drop upstreamed patch.

Add a patch to correctly set LDFLAGS for one of the libraries and Python bindings.

Add dependencies to build Python bindings
(directly inheriting setuptools3 class does not work, as the build is Makefile-managed) and a snippet to install them.

Signed-off-by Alexander Kanavin <[email protected]>

---
 ...DFLAGS-when-building-libbtrfsutil.so.patch | 35 ++++++++++
 .../btrfs-tools/ftw-subdir-walk.patch         | 69 -------------------
 ...-tools_4.15.1.bb => btrfs-tools_4.16.1.bb} | 12 ++--
 3 files changed, 43 insertions(+), 73 deletions(-)
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/ftw-subdir-walk.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.15.1.bb => btrfs-tools_4.16.1.bb} (78%)

meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch new file +35 -0

new file mode 100644
index 00000000000..a8fcfc0f73c
@@ -0,0 +1,35 @@
+From eecc48ecad359cd4fab650ce49cfe57e99d1859d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 17 May 2018 12:21:31 +0300
+Subject: [PATCH] Add LDFLAGS when building libbtrfsutil.so and python
+ bindings.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 10f0e3b0..1697794c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -402,7 +402,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c
+
+ libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects)
+       @echo "    [LD]     $@"
+-      $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) \
++      $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(LDFLAGS) $(libbtrfsutil_objects) \
+               -shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@
+
+ libbtrfsutil.a: $(libbtrfsutil_objects)
+@@ -417,7 +417,7 @@ ifeq ($(PYTHON_BINDINGS),1)
+ libbtrfsutil_python: libbtrfsutil.so.$(libbtrfsutil_major) libbtrfsutil.so libbtrfsutil/btrfsutil.h
+       @echo "    [PY]     libbtrfsutil"
+       $(Q)cd libbtrfsutil/python; \
+-              CFLAGS= LDFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build
++              CFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build
+
+ .PHONY: libbtrfsutil_python
+ endif

meta/recipes-devtools/btrfs-tools/btrfs-tools/ftw-subdir-walk.patch deleted +0 ~~-69~~

deleted file mode 100644
index fbe0c47849f..00000000000
@@ -1,69 +0,0 @@
-From patchwork Wed Mar 28 06:39:09 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: btrfs-progs: mkfs/rootdir: Don't follow symbolic link when calcuating
- size
-From: Qu Wenruo <[email protected]>
-X-Patchwork-Id: 10312225
-Message-Id: <[email protected]>
-To: [email protected]
-Date: Wed, 28 Mar 2018 14:39:09 +0800
-
-[BUG]
-If we have a symbolic link in rootdir pointing to non-existing location,
-mkfs.btrfs --rootdir will just fail:
-------
-$ mkfs.btrfs  -f --rootdir /tmp/rootdir/ /dev/data/btrfs
-btrfs-progs v4.15.1
-See http://btrfs.wiki.kernel.org for more information.
-
-ERROR: ftw subdir walk of /tmp/rootdir/ failed: No such file or directory
-------
-
-[CAUSE]
-Commit 599a0abed564 ("btrfs-progs: mkfs/rootdir: Use over-reserve method
-to make size estimate easier") add extra ftw walk to estimate the
-filesystem size.
-
-Such default ftw walk will follow symbolic link and gives ENOENT error.
-
-[FIX]
-Use nftw() to specify FTW_PHYS so we won't follow symbolic link for size
-calculation.
-
-Reported-by: Alexander Kanavin <[email protected]>
-Fixes: 599a0abed564 ("btrfs-progs: mkfs/rootdir: Use over-reserve method to make size estimate easier")
-Signed-off-by: Qu Wenruo <[email protected]>
-Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10312225/]
----
- mkfs/rootdir.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
-index a1d223a2408a..33c3ff1e18cf 100644
---- a/mkfs/rootdir.c
-+++ b/mkfs/rootdir.c
-@@ -696,7 +696,7 @@ out:
- }
-
- static int ftw_add_entry_size(const char *fpath, const struct stat *st,
--                            int type)
-+                            int type, struct FTW *ftwbuf)
- {
-       /*
-        * Failed to read the directory, mostly due to EPERM.  Abort ASAP, so
-@@ -731,7 +731,12 @@ u64 btrfs_mkfs_size_dir(const char *dir_name, u32 sectorsize, u64 min_dev_size,
-       fs_block_size = sectorsize;
-       ftw_data_size = 0;
-       ftw_meta_nr_inode = 0;
--      ret = ftw(dir_name, ftw_add_entry_size, 10);
-+
-+      /*
-+       * Symbolic link is not followed when creating files, so no need to
-+       * follow them here.
-+       */
-+      ret = nftw(dir_name, ftw_add_entry_size, 10, FTW_PHYS);
-       if (ret < 0) {
-               error("ftw subdir walk of %s failed: %s", dir_name,
-                       strerror(errno));

meta/recipes-devtools/btrfs-tools/btrfs-tools_4.16.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb +8 -5

similarity index 78%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.16.1.bb
index f7ea27321cf..18f11ba89e3 100644
@@ -10,17 +10,17 @@ HOMEPAGE = "https://btrfs.wiki.kernel.org"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
 SECTION = "base"
-DEPENDS = "util-linux attr e2fsprogs lzo acl"
+DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "3097f02c948f69f520c565ff8f8ba476aa6edb88"
+SRCREV = "f7fc27cb20924cc340a2a522655969253dd97ae9"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Makefile-build-mktables-using-native-gcc.patch \
-           file://ftw-subdir-walk.patch \
+           file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
            "
 
-inherit autotools-brokensep pkgconfig manpages
+inherit autotools-brokensep pkgconfig manpages distutils3-base
 
 CLEANBROKEN = "1"

@@ -36,4 +36,8 @@ do_configure_prepend() {
 
 S = "${WORKDIR}/git"
 
+do_install_append() {
+    oe_runmake 'DESTDIR=${D}' install_python
+}
+
 BBCLASSEXTEND = "native"
--

2.17.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Alexander Kanavin

author

2018-05-17 11:46 UTC #7 lore raw

PATCH 7/10 rt-tests: fix upstream version check

In reply to Alexander Kanavin

Signed-off-by Alexander Kanavin <[email protected]>

---
 meta/recipes-rt/rt-tests/rt-tests.inc | 2 ++
 1 file changed, 2 insertions(+)

meta/recipes-rt/rt-tests/rt-tests.inc +2 -0

index 5606d8e3851..f87952e0a8d 100644
@@ -3,6 +3,8 @@ SRCREV = "dff174f994f547a5785d32454865f140daacb0f5"
 PE = "1"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git"
+# 1.2 and 1.3 seem to be development versions
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!1\.2)(?!1\.3)(\d+(\.\d+)+))"
 
 S = "${WORKDIR}/git"

Signature · 1 line

2.17.0

Alexander Kanavin

author

2018-05-17 11:46 UTC #8 lore raw

PATCH 8/10 openssl: fix upstream version check for 1.0 version

In reply to Alexander Kanavin

Signed-off-by Alexander Kanavin <[email protected]>

---
 meta/recipes-connectivity/openssl/openssl10.inc | 1 +
 1 file changed, 1 insertion(+)

meta/recipes-connectivity/openssl/openssl10.inc +1 -0

index 645d64ec85e..f7a8de823a5 100644
@@ -16,6 +16,7 @@ PROVIDES += "openssl10"
 SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
           "
 S = "${WORKDIR}/openssl-${PV}"
+UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar"
 
 PACKAGECONFIG ?= "cryptodev-linux"
 PACKAGECONFIG[perl] = ",,,"

Signature · 1 line

2.17.0

Alexander Kanavin

author

2018-05-17 11:46 UTC #9 lore raw

PATCH 9/10 meson: update to 0.46.1

In reply to Alexander Kanavin

Signed-off-by Alexander Kanavin <[email protected]>

---
 .../meson/{meson_0.46.0.bb => meson_0.46.1.bb}                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.46.0.bb => meson_0.46.1.bb} (83%)

meta/recipes-devtools/meson/meson_0.46.1.bb renamed from meta/recipes-devtools/meson/meson_0.46.0.bb +2 -2

similarity index 83%
rename from meta/recipes-devtools/meson/meson_0.46.0.bb
rename to meta/recipes-devtools/meson/meson_0.46.1.bb
index 7334045e05f..a18cab81f4a 100644
@@ -10,8 +10,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/${BP}.tar
            file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \
            file://0003-native_bindir.patch \
            "
-SRC_URI[md5sum] = "e3301606017e364a0d7e1c3b755e7a28"
-SRC_URI[sha256sum] = "b7df91b01a358a8facdbfa33596a47cda38a760435ab55e1985c0bff06a9cbf0"
+SRC_URI[md5sum] = "1698f6526574839de5dcdc45e3f7d582"
+SRC_URI[sha256sum] = "19497a03e7e5b303d8d11f98789a79aba59b5ad4a81bd00f4d099be0212cee78"
 UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
 
 inherit setuptools3

Signature · 1 line

2.17.0

Alexander Kanavin

author

2018-05-17 11:46 UTC #10 lore raw

PATCH 10/10 qemuwrapper-cross: always fall back to x86_64 and i386 variants of qemu

In reply to Alexander Kanavin

This helps in particular when executing nativesdk- postinsts; previously they were attempted only with target qemu, and this obivously failed.

This could be solved by properly mapping the binary to be run to the best available qemu variant for the binary architecture, but that would be a lot more invasive change, and so I think a simple fallback should be fine.

Signed-off-by Alexander Kanavin <[email protected]>

---
 .../qemu/qemuwrapper-cross_1.0.bb             | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb +11 ~~-17~~

index c983fbae667..091aa52a33e 100644
@@ -17,30 +17,24 @@ do_install () {
 	qemu_binary=${@qemu_target_binary(d)}
 	qemu_options='${QEMU_OPTIONS}'
 	echo "$qemu_binary $qemu_options \"\$@\"" >> ${D}${bindir_crossscripts}/qemuwrapper
-	fallback_qemu_bin=
-	case $qemu_binary in
-		"qemu-i386")
-			fallback_qemu_bin=qemu-x86_64
-			;;
-		"qemu-x86_64")
-			fallback_qemu_bin=qemu-i386
-			;;
-		*)
-			;;
-	esac
-
-	if [ -n "$fallback_qemu_bin" ]; then
-
-		cat >> ${D}${bindir_crossscripts}/qemuwrapper << EOF
+
+	cat >> ${D}${bindir_crossscripts}/qemuwrapper << EOF
 rc=\$?
 if [ \$rc = 255 ]; then
-	$fallback_qemu_bin "\$@"
+	qemu-x86_64 "\$@"
 	rc=\$?
 fi
 exit \$rc
 EOF
 
-	fi
+	cat >> ${D}${bindir_crossscripts}/qemuwrapper << EOF
+rc=\$?
+if [ \$rc = 255 ]; then
+	qemu-i386 "\$@"
+	rc=\$?
+fi
+exit \$rc
+EOF
 
 	chmod +x ${D}${bindir_crossscripts}/qemuwrapper
 }

Signature · 1 line

2.17.0