iscsitarget: Blacklist compile failed
PATCH 1/6 iscsitarget: Blacklist compile failed
Kernel header changes are causing this issues. iscsctarget has been dropping by other distros in favor of tgt.
Signed-off-by Armin Kuster <[email protected]>
--- .../recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +2 -0
@@ -60,3 +60,5 @@ FILES_${PN} += "${sbindir} \ RDEPENDS_${PN} = "kernel-module-iscsi-trgt" RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c" + +PNBLACKLIST[iscsitarget] = "error: implicit declaration of function 'init_timer'; did you mean 'init_timers'?; 4.15 kernel issues"
Signature · 1 line
2.7.4
PATCH 2/6 libmusicbrainz: refresh patches
used quilt.
Details:
Applying patch allow-libdir-override.patch patching file CMakeLists.txt
Hunk #1 succeeded at 36 with fuzz 1 (offset 10 lines).
Now at patch allow-libdir-override.patch
Signed-off-by Armin Kuster <[email protected]>
--- .../musicbrainz/files/allow-libdir-override.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch +5 -5
@@ -6,11 +6,11 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Kumar Gala <[email protected]> -Index: libmusicbrainz-3.0.3/CMakeLists.txt +Index: git/CMakeLists.txt =================================================================== ---- libmusicbrainz-3.0.3.orig/CMakeLists.txt -+++ libmusicbrainz-3.0.3/CMakeLists.txt -@@ -26,7 +26,7 @@ FIND_PACKAGE(DiscId) +--- git.orig/CMakeLists.txt ++++ git/CMakeLists.txt +@@ -36,7 +36,7 @@ FIND_PACKAGE(LibXml2 REQUIRED) SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE)
@@ -18,4 +18,4 @@ Index: libmusicbrainz-3.0.3/CMakeLists.txt +SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries") SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz3.pc) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz5.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc)
Signature · 1 line
2.7.4
PATCH 3/6 libdc1294: refresh patch
In reply to Armin KusterApplying patch install_examples.patch
patching file examples/Makefile.am
Hunk #1 succeeded at 36 with fuzz 1.
Signed-off-by Armin Kuster <[email protected]>
--- .../recipes-multimedia/libdc1394/files/install_examples.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch +4 -4
@@ -1,9 +1,9 @@ Index: libdc1394/examples/Makefile.am =================================================================== ---- libdc1394.orig/examples/Makefile.am 2012-06-30 17:50:46.000000000 -0700 -+++ libdc1394/examples/Makefile.am 2012-06-30 19:02:13.822646430 -0700 -@@ -36,8 +36,7 @@ - AM_LDFLAGS = -framework CoreFoundation -framework Carbon +--- libdc1394.orig/examples/Makefile.am ++++ libdc1394/examples/Makefile.am +@@ -36,8 +36,7 @@ if HAVE_MACOSX + AM_LDFLAGS = -framework CoreFoundation $(FRAMEWORK_IOKIT) endif -noinst_PROGRAMS = $(A)
Signature · 1 line
2.7.4
PATCH 4/6 schroedinger: refresh patch
In reply to Armin KusterApplying patch configure.ac.patch
patching file configure.ac
Hunk #1 succeeded at 54 with fuzz 2.
Now at patch configure.ac.patch
Signed-off-by Armin Kuster <[email protected]>
--- .../schroedinger/schroedinger/configure.ac.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch +4 -4
@@ -5,10 +5,10 @@ Signed-off-by: Paul Eggleton <[email protected]> Upstream-Status: Inappropriate [configuration] -Index: schroedinger-1.0.9/configure.ac +Index: schroedinger-1.0.11/configure.ac =================================================================== ---- schroedinger-1.0.9.orig/configure.ac -+++ schroedinger-1.0.9/configure.ac +--- schroedinger-1.0.11.orig/configure.ac ++++ schroedinger-1.0.11/configure.ac @@ -54,7 +54,7 @@ if test "x${HAVE_ORC}" != xyes ; then AC_ERROR([orc-0.4 >= $ORC_VER is required]) fi
@@ -16,5 +16,5 @@ Index: schroedinger-1.0.9/configure.ac -ORCC=`$PKG_CONFIG --variable=orcc orc-0.4` +ORCC=$STAGING_DIR`$PKG_CONFIG --variable=orcc orc-0.4` AC_SUBST(ORCC) + AM_CONDITIONAL(HAVE_ORCC, test "x$cross_compiling" != xyes) - AC_ARG_WITH([thread],
Signature · 1 line
2.7.4
PATCH 5/6 android-tools: refresh patch
In reply to Armin KusterApplying patch preserve-ownership.patch
patching file system/extras/ext4_utils/make_ext4fs_main.c Hunk #1 succeeded at 47 with fuzz 2 (offset -2 lines). Hunk #2 succeeded at 81 (offset -2 lines).
Hunk #3 succeeded at 144 (offset -2 lines). patching file system/extras/ext4_utils/make_ext4fs.c
Now at patch preserve-ownership.patch
Signed-off-by Armin Kuster <[email protected]>
--- .../android-tools/preserve-ownership.patch | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch +12 -8
@@ -9,11 +9,13 @@ Upstream-Status: Inappropriate system/extras/ext4_utils/make_ext4fs_main.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) ---- a/system/extras/ext4_utils/make_ext4fs_main.c -+++ b/system/extras/ext4_utils/make_ext4fs_main.c -@@ -49,13 +49,15 @@ extern struct fs_info info; +Index: git/system/extras/ext4_utils/make_ext4fs_main.c +=================================================================== +--- git.orig/system/extras/ext4_utils/make_ext4fs_main.c ++++ git/system/extras/ext4_utils/make_ext4fs_main.c +@@ -47,13 +47,15 @@ struct selabel_handle; + extern struct fs_info info; - extern struct selabel_handle* selinux_android_file_context_handle(void); +extern int preserve_owner; +
@@ -28,7 +30,7 @@ Upstream-Status: Inappropriate fprintf(stderr, " <filename> [<directory>]\n"); } -@@ -81,7 +83,7 @@ int main(int argc, char **argv) +@@ -79,7 +81,7 @@ int main(int argc, char **argv) struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } }; #endif
@@ -37,7 +39,7 @@ Upstream-Status: Inappropriate switch (opt) { case 'l': info.len = parse_num(optarg); -@@ -144,6 +146,10 @@ int main(int argc, char **argv) +@@ -142,6 +144,10 @@ int main(int argc, char **argv) } #endif break;
@@ -48,8 +50,10 @@ Upstream-Status: Inappropriate case 'v': verbose = 1; break; ---- a/system/extras/ext4_utils/make_ext4fs.c -+++ b/system/extras/ext4_utils/make_ext4fs.c +Index: git/system/extras/ext4_utils/make_ext4fs.c +=================================================================== +--- git.orig/system/extras/ext4_utils/make_ext4fs.c ++++ git/system/extras/ext4_utils/make_ext4fs.c @@ -67,6 +67,8 @@ #endif
Signature · 1 line
2.7.4
Re: [PATCH 5/6] android-tools: refresh patch
Is something wrong with https://patchwork.openembedded.org/patch/149993/ ?
Quoted 81 lines · Armin Kuster
Applying patch preserve-ownership.patch
patching filesystem/extras/ext4_utils/make_ext4fs_main.cHunk #1 succeeded at 47 with fuzz 2 (offset -2 lines). Hunk #2 succeeded at 81 (offset -2 lines).
Hunk #3 succeeded at 144 (offset -2 lines). patching filesystem/extras/ext4_utils/make_ext4fs.cNow at patch preserve-ownership.patch
Signed-off-by Armin Kuster <[email protected]>--- .../android-tools/preserve-ownership.patch | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)meta-oe/recipes-devtools/android-tools/android-tools/ renamed from meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch +0
-0preserve-ownership.patch
index 85af81f..fc350fb 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools/ preserve-ownership.patch
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/ preserve-ownership.patchmeta-oe/recipes-devtools/android-tools/android-tools/ renamed from meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch +12
-9@@ -9,11 +9,13 @@ Upstream-Status: Inappropriate system/extras/ext4_utils/make_ext4fs_main.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) ---- a/system/extras/ext4_utils/make_ext4fs_main.c -+++ b/system/extras/ext4_utils/make_ext4fs_main.c -@@ -49,13 +49,15 @@ extern struct fs_info info; +Index: git/system/extras/ext4_utils/make_ext4fs_main.c +=================================================================== +--- git.orig/system/extras/ext4_utils/make_ext4fs_main.c ++++ git/system/extras/ext4_utils/make_ext4fs_main.c +@@ -47,13 +47,15 @@ struct selabel_handle; + extern struct fs_info info; - extern struct selabel_handle* selinux_android_file_context_handle(void); +extern int preserve_owner; +@@ -28,7 +30,7 @@ Upstream-Status: Inappropriate fprintf(stderr, " <filename> [<directory>]\n"); } -@@ -81,7 +83,7 @@ int main(int argc, char **argv) +@@ -79,7 +81,7 @@ int main(int argc, char **argv) struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } }; #endif@@ -37,7 +39,7 @@ Upstream-Status: Inappropriate switch (opt) { case 'l': info.len = parse_num(optarg); -@@ -144,6 +146,10 @@ int main(int argc, char **argv) +@@ -142,6 +144,10 @@ int main(int argc, char **argv) } #endif break;@@ -48,8 +50,10 @@ Upstream-Status: Inappropriate case 'v': verbose = 1; break; ---- a/system/extras/ext4_utils/make_ext4fs.c -+++ b/system/extras/ext4_utils/make_ext4fs.c +Index: git/system/extras/ext4_utils/make_ext4fs.c +=================================================================== +--- git.orig/system/extras/ext4_utils/make_ext4fs.c ++++ git/system/extras/ext4_utils/make_ext4fs.c @@ -67,6 +67,8 @@ #endif --2.7.4
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [PATCH 5/6] android-tools: refresh patch
Quoted 1 line · Martin Jansa
Is something wrong with https://patchwork.openembedded.org/patch/149993/ ?
no. just missed it. thanks.
- armin
Quoted 90 lines
On Wed, Apr 25, 2018 at 4:13 PM, Armin Kuster <[email protected] <mailto:[email protected]>> wrote:
Applying patch preserve-ownership.patch patching file system/extras/ext4_utils/make_ext4fs_main.c Hunk #1 succeeded at 47 with fuzz 2 (offset -2 lines). Hunk #2 succeeded at 81 (offset -2 lines). Hunk #3 succeeded at 144 (offset -2 lines). patching file system/extras/ext4_utils/make_ext4fs.c Now at patch preserve-ownership.patch Signed-off-by: Armin Kuster <[email protected] <mailto:[email protected]>> --- .../android-tools/preserve-ownership.patch | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch b/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch index 85af81f..fc350fb 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch @@ -9,11 +9,13 @@ Upstream-Status: Inappropriate system/extras/ext4_utils/make_ext4fs_main.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) ---- a/system/extras/ext4_utils/make_ext4fs_main.c -+++ b/system/extras/ext4_utils/make_ext4fs_main.c -@@ -49,13 +49,15 @@ extern struct fs_info info; +Index: git/system/extras/ext4_utils/make_ext4fs_main.c +=================================================================== +--- git.orig/system/extras/ext4_utils/make_ext4fs_main.c ++++ git/system/extras/ext4_utils/make_ext4fs_main.c +@@ -47,13 +47,15 @@ struct selabel_handle; + extern struct fs_info info; - extern struct selabel_handle* selinux_android_file_context_handle(void); +extern int preserve_owner; + @@ -28,7 +30,7 @@ Upstream-Status: Inappropriate fprintf(stderr, " <filename> [<directory>]\n"); } -@@ -81,7 +83,7 @@ int main(int argc, char **argv) +@@ -79,7 +81,7 @@ int main(int argc, char **argv) struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } }; #endif @@ -37,7 +39,7 @@ Upstream-Status: Inappropriate switch (opt) { case 'l': info.len = parse_num(optarg); -@@ -144,6 +146,10 @@ int main(int argc, char **argv) +@@ -142,6 +144,10 @@ int main(int argc, char **argv) } #endif break; @@ -48,8 +50,10 @@ Upstream-Status: Inappropriate case 'v': verbose = 1; break; ---- a/system/extras/ext4_utils/make_ext4fs.c -+++ b/system/extras/ext4_utils/make_ext4fs.c +Index: git/system/extras/ext4_utils/make_ext4fs.c +=================================================================== +--- git.orig/system/extras/ext4_utils/make_ext4fs.c ++++ git/system/extras/ext4_utils/make_ext4fs.c @@ -67,6 +67,8 @@ #endif -- 2.7.4 -- _______________________________________________ Openembedded-devel mailing list [email protected] <mailto:[email protected]> http://lists.openembedded.org/mailman/listinfo/openembedded-devel <http://lists.openembedded.org/mailman/listinfo/openembedded-devel>
PATCH 6/6 gst-rtsp: refresh patch
In reply to Armin KusterApplying patch 0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch patching file bindings/python/Makefile.am
Hunk #1 succeeded at 14 with fuzz 1.
patching file examples/Makefile.am
patching file tests/Makefile.am
Now at patch 0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
Signed-off-by Armin Kuster <[email protected]>
--- ...ecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch | 34 ++++++++++++---------- 1 file changed, 19 insertions(+), 15 deletions(-)
meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch +19 -15
@@ -1,34 +1,38 @@ index gst-rtsp_0.10.8/bindings/python/Makefile.am ---- gst-rtsp_0.10.8.orig/bindings/python/Makefile.am -+++ gst-rtsp_0.10.8/bindings/python/Makefile.am +Index: gst-rtsp-0.10.8/bindings/python/Makefile.am +=================================================================== +--- gst-rtsp-0.10.8.orig/bindings/python/Makefile.am ++++ gst-rtsp-0.10.8/bindings/python/Makefile.am @@ -14,7 +14,7 @@ defs_DATA = $(DEFS) defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs OVERRIDES = rtspserver.override - + -INCLUDES = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES) - + rtspserver_la_CFLAGS = -I$(top_srcdir)/src \ - $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -index gst-rtsp_0.10.8/examples/Makefile.am ---- gst-rtsp_0.10.8.orig/examples/Makefile.am -+++ gst-rtsp_0.10.8/examples/Makefile.am + $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +Index: gst-rtsp-0.10.8/examples/Makefile.am +=================================================================== +--- gst-rtsp-0.10.8.orig/examples/Makefile.am ++++ gst-rtsp-0.10.8/examples/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = test-video test-ogg test-mp4 test-readme test-launch test-sdp test-uri test-auth - + -INCLUDES = -I$(top_srcdir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) - + AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) AM_LDFLAGS = \ -index gst-rtsp_0.10.8/tests/Makefile.am ---- gst-rtsp_0.10.8.orig/tests/Makefile.am -+++ gst-rtsp_0.10.8/tests/Makefile.am +Index: gst-rtsp-0.10.8/tests/Makefile.am +=================================================================== +--- gst-rtsp-0.10.8.orig/tests/Makefile.am ++++ gst-rtsp-0.10.8/tests/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = test-cleanup - + -INCLUDES = -I$(top_srcdir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) - + AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) AM_LDFLAGS = \
Signature · 1 line
2.7.4
LGTM
Quoted 36 lines · Armin Kuster
Kernel header changes are causing this issues. iscsctarget has been dropping by other
distros in favor of tgt.Signed-off-by Armin Kuster <[email protected]>---
.../recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb | 2 ++1 file changed, 2 insertions(+)diff --git a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+ svn502.bb b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+ svn502.bb
index 6593661..5d13591 100644
--- a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+ svn502.bb
+++ b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+ svn502.bbmeta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +2
-0@@ -60,3 +60,5 @@ FILES_${PN} += "${sbindir} \ RDEPENDS_${PN} = "kernel-module-iscsi-trgt" RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c" + +PNBLACKLIST[iscsitarget] = "error: implicit declaration of function'
init_timer'; did you mean 'init_timers'?; 4.15 kernel issues" --
2.7.4--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel