Skip to contentSkip to conversation

obexftp: use makefile instead of ninja cmake generator

PATCH New Khem Raj 1 participant 4 messages Feb 1, 2018

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/4 obexftp: use makefile instead of ninja cmake generator

Fixes

| NOTE: make -j 44 crctable
| make: *** No rule to make target 'crctable'. Stop.

---
 meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb +2 -0
index 489861cb7..b4a914d92 100644
@@ -16,6 +16,8 @@ SRC_URI[sha256sum] = "d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1
 
 inherit cmake pkgconfig
 
+OECMAKE_GENERATOR = "Unix Makefiles"
+
 PACKAGECONFIG ?= ""
 # fuse support will need meta-filesystems layer
 PACKAGECONFIG[fuse] = "-DENABLE_FUSE=ON,-DENABLE_FUSE=OFF,fuse"
Signature · 1 line
2.16.1
author
#1 lore raw

PATCH 2/4 caps: Replace obsoleted pow10f() with exp10f

---
 .../0001-Do-not-use-obsolete-pow10f-function.patch | 50 ++++++++++++++++++++++
 .../recipes-multimedia/caps/caps_0.9.24.bb         |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch
meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch new file +50 -0
new file mode 100644
index 000000000..bd5e1b603
@@ -0,0 +1,50 @@
+From 0cc7362e171616dcfeb93c6e1576362761bf14e5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 31 Jan 2018 18:37:16 -0800
+Subject: [PATCH] Do not use obsolete pow10f() function
+
+exp10 name is standardized in TS 18661-4 and its
+available in glibc since version 2.1
+it has been now removed from glibc 2.27+
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ dsp/v4f_IIR2.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dsp/v4f_IIR2.h b/dsp/v4f_IIR2.h
+index a68ecf5..ebd1234 100644
+--- a/dsp/v4f_IIR2.h
++++ b/dsp/v4f_IIR2.h
+@@ -33,7 +33,7 @@
+ namespace DSP {
+ 
+ #ifdef __APPLE__
+-inline float pow10f(float f) {return pow(10,f);}
++inline float exp10f(float f) {return __exp10f(f);}
+ #endif
+ 
+ class RBJv4
+@@ -142,7 +142,7 @@ class IIR2v4
+ 				/* A = pow (10, gain / 40) */
+ 				v4f_t A = (v4f_t) {.025,.025,.025,.025};
+ 				A *= gain;
+-				A = v4f_map<pow10f> (A);
++				A = v4f_map<exp10f> (A);
+ 
+ 				RBJv4 p (f, Q);
+ 
+@@ -429,7 +429,7 @@ class IIR2v4Bank
+ 					/* A = pow (10, gain / 40) */
+ 					v4f_t A = (v4f_t) {.025,.025,.025,.025};
+ 					A *= gain[i];
+-					A = v4f_map<pow10f> (A);
++					A = v4f_map<exp10f> (A);
+ 
+ 					RBJv4 p (f[i], Q[i]);
+ 
+-- 
+2.16.1
+
meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb +1 -0
index 29167d1aa..fe864c49c 100644
@@ -7,6 +7,7 @@ SRC_URI = "http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \
            file://Avoid-ambiguity-in-div-invocation.patch \
            file://0001-basic.h-Use-c99-supported-stdint-types.patch \
            file://append_ldflags.patch \
+           file://0001-Do-not-use-obsolete-pow10f-function.patch \
            "
 
 SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626"
Signature · 1 line
2.16.1
author
#2 lore raw

PATCH 3/4 xfsprogs: Upgrade to 4.14

In reply to Khem Raj

Fix build with glibc 2.27 while here

---
 ...d-Check-for-sync_file_range-libc-function.patch |   82 +
 ...fs-remove-double-underscore-integer-types.patch | 2082 -----------
 ...gs-remove-double-underscore-integer-types.patch | 3800 --------------------
 .../files/remove_flags_from_build_flags.patch      |   12 +-
 .../xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch  |  117 -
 .../{xfsprogs_4.12.0.bb => xfsprogs_4.14.0.bb}     |    8 +-
 6 files changed, 91 insertions(+), 6010 deletions(-)
 create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch
 delete mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch
 delete mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/0001-xfsprogs-remove-double-underscore-integer-types.patch
 delete mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
 rename meta-filesystems/recipes-utils/xfsprogs/{xfsprogs_4.12.0.bb => xfsprogs_4.14.0.bb} (84%)
meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch new file +82 -0
new file mode 100644
index 000000000..d8ff55531
@@ -0,0 +1,82 @@
+From ae7172194d3fbb563ff8bbe7c02d34f1bd0e5ec9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 31 Jan 2018 21:28:53 -0800
+Subject: [PATCH] build: Check for sync_file_range libc function
+
+glibc 2.27 now has sync_file_range()
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Pending
+
+ include/builddefs.in | 1 +
+ io/Makefile          | 5 ++++-
+ io/io.h              | 2 +-
+ io/sync_file_range.c | 3 +++
+ 4 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/include/builddefs.in b/include/builddefs.in
+index 92d5076..504225a 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -105,6 +105,7 @@ HAVE_FIEMAP = @have_fiemap@
+ HAVE_PREADV = @have_preadv@
+ HAVE_PWRITEV2 = @have_pwritev2@
+ HAVE_COPY_FILE_RANGE = @have_copy_file_range@
++HAVE_NR_COPY_FILE_RANGE = @have_nr_copy_file_range@
+ HAVE_SYNC_FILE_RANGE = @have_sync_file_range@
+ HAVE_SYNCFS = @have_syncfs@
+ HAVE_READDIR = @have_readdir@
+diff --git a/io/Makefile b/io/Makefile
+index 6725936..1876e95 100644
+--- a/io/Makefile
++++ b/io/Makefile
+@@ -59,10 +59,13 @@ CFILES += inject.c resblks.c
+ LCFLAGS += -DHAVE_INJECT -DHAVE_RESBLKS
+ endif
+ 
+-ifeq ($(HAVE_COPY_FILE_RANGE),yes)
++ifeq ($(HAVE_NR_COPY_FILE_RANGE),yes)
+ CFILES += copy_file_range.c
++LCFLAGS += -DHAVE_NR_COPY_FILE_RANGE
++ifeq ($(HAVE_COPY_FILE_RANGE),yes)
+ LCFLAGS += -DHAVE_COPY_FILE_RANGE
+ endif
++endif
+ 
+ ifeq ($(HAVE_SYNC_FILE_RANGE),yes)
+ CFILES += sync_file_range.c
+diff --git a/io/io.h b/io/io.h
+index 3862985..79ddc7b 100644
+--- a/io/io.h
++++ b/io/io.h
+@@ -158,7 +158,7 @@ extern void		fiemap_init(void);
+ #define fiemap_init()	do { } while (0)
+ #endif
+ 
+-#ifdef HAVE_COPY_FILE_RANGE
++#if defined(HAVE_NR_COPY_FILE_RANGE) && !defined(HAVE_COPY_FILE_RANGE)
+ extern void		copy_range_init(void);
+ #else
+ #define copy_range_init()	do { } while (0)
+diff --git a/io/sync_file_range.c b/io/sync_file_range.c
+index 7e4f3e6..aafea01 100644
+--- a/io/sync_file_range.c
++++ b/io/sync_file_range.c
+@@ -16,6 +16,7 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#ifndef HAVE_COPY_FILE_RANGE
+ #include "command.h"
+ #include "input.h"
+ #include "init.h"
+@@ -104,3 +105,5 @@ sync_range_init(void)
+ 
+ 	add_command(&sync_range_cmd);
+ }
++
++#endif
+-- 
+2.16.1
+
meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch deleted +0 -2082

2,082 lines not on this page · raw message

meta-filesystems/recipes-utils/xfsprogs/files/0001-xfsprogs-remove-double-underscore-integer-types.patch deleted +0 -3800

836 lines not on this page · raw message

meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch +6 -6
index bba9a25c2..bd2d02563 100644

Lines of this file are not shown. View the raw message.

meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch deleted +0 -117

117 lines not on this page · raw message

meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb renamed from meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb +3 -5
similarity index 84%
rename from meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb
rename to meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb
index 0788695ee..5d76afe00 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.16.1

Part of the diff is not shown here. View the raw message.

author
#3 lore raw

PATCH 4/4 stress-ng: Upgrade to 0.09.14

In reply to Khem Raj

drop upstreamed patch

---
 .../0003-stress-fcntl.c-fix-syntax-errors.patch    | 47 ----------------------
 .../{stress-ng_0.09.09.bb => stress-ng_0.09.14.bb} |  9 ++---
 2 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100644 meta-oe/recipes-test/stress-ng/stress-ng/0003-stress-fcntl.c-fix-syntax-errors.patch
 rename meta-oe/recipes-test/stress-ng/{stress-ng_0.09.09.bb => stress-ng_0.09.14.bb} (73%)
meta-oe/recipes-test/stress-ng/stress-ng/0003-stress-fcntl.c-fix-syntax-errors.patch deleted +0 -47
deleted file mode 100644
index 4b6a9b391..000000000
@@ -1,47 +0,0 @@
-From 8537dcafb12be4d986b571f1e1d9f3ceecdc8e63 Mon Sep 17 00:00:00 2001
-From: Tim Orling <[email protected]>
-Date: Sun, 7 Jan 2018 21:29:12 -0800
-Subject: [PATCH] stress-fcntl.c: fix syntax errors
-
-Signed-off-by: Tim Orling <[email protected]>
-
-Upstream-status: Accepted
-(commit 61d93d6857256cd49df6a6302caf6e7bb69b0f46)
----
- stress-fcntl.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/stress-fcntl.c b/stress-fcntl.c
-index 7c15d28..b7eade2 100644
---- a/stress-fcntl.c
-+++ b/stress-fcntl.c
-@@ -173,7 +173,7 @@ static int do_fcntl(const args_t *args, const int fd)
- 		owner.pid = getpgrp();
- 		ret = fcntl(fd, F_SETOWN_EX, &owner);
- 		check_return(args, ret, "F_SETOWN_EX, F_OWNER_PGRP");
--#else if defined(HAVE_GETPGRP) && defined(F_OWNER_GID)
-+#elif defined(HAVE_GETPGRP) && defined(F_OWNER_GID)
- 		owner.type = F_OWNER_GID;
- 		owner.pid = getpgrp();
- 		ret = fcntl(fd, F_SETOWN_EX, &owner);
-@@ -202,7 +202,7 @@ static int do_fcntl(const args_t *args, const int fd)
- 		owner.type = F_OWNER_PGRP;
- 		ret = fcntl(fd, F_GETOWN_EX, &owner);
- 		check_return(args, ret, "F_GETOWN_EX, F_OWNER_PGRP");
--#ele if defined(F_OWNER_GID)
-+#elif defined(F_OWNER_GID)
- 		owner.type = F_OWNER_GID;
- 		ret = fcntl(fd, F_GETOWN_EX, &owner);
- 		check_return(args, ret, "F_GETOWN_EX, F_OWNER_GID");
-@@ -436,7 +436,7 @@ ofd_lock_abort:	{ /* Nowt */ }
- #endif
- 		};
- 
--		ret = fcntl(fd, F_GET_FILE_RW_HINT, &hint)
-+		ret = fcntl(fd, F_GET_FILE_RW_HINT, &hint);
- 		if (ret == 0) {
- 			for (i = 0; i < SIZEOF_ARRAY(hints); i++) {
- 				hint = hints[i];
--- 
-2.14.3
-
meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb renamed from meta-oe/recipes-test/stress-ng/stress-ng_0.09.09.bb +4 -5
similarity index 73%
rename from meta-oe/recipes-test/stress-ng/stress-ng_0.09.09.bb
rename to meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb
index 24f55ada2..7fab43025 100644
@@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "zlib libaio"
 
 SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \
+           file://0002-stress-fcntl-fix-build-for-musl.patch \
           "
 SRC_URI_append_libc-musl = " \
     file://0001-Several-changes-to-fix-musl-build.patch \
-    file://0002-stress-fcntl-fix-build-for-musl.patch \
-    file://0003-stress-fcntl.c-fix-syntax-errors.patch"
-
-SRC_URI[md5sum] = "6e4df71095e780654ccc0a713b8423fe"
-SRC_URI[sha256sum] = "e993fddb1d990a0cdb23b2af6cf6c417a1c09e155ada7c558ad80eae8a5feed3"
+    "
+SRC_URI[md5sum] = "1f8b6c2c2830704d2a2814c16082d48e"
+SRC_URI[sha256sum] = "02cac34a5cb041197af60c1867844c6cbb089a6d10a38cdcf7b8f27bfaa6ef8f"
 
 UPSTREAM_CHECK_URI ?= "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/"
 UPSTREAM_CHECK_REGEX ?= "(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.16.1