[yocto] [meta-cgl][PATCH 2/3 V2] pacemaker: refresh patches to fix QA warning
Refresh patches with devtool command to fix do_patch warning. Remove fix_missing_qb_array.patch since it had been fixed upstream. Signed-off-by: Yi Zhao--- .../pacemaker/0001-pacemaker-fix-xml-config.patch | 14 ++ ...earch-header-from-STAGING_INCDIR-to-walka.patch | 10 -- .../0003-pacemaker-fix-header-defs-lookup.patch| 12 +--- .../0004-pacemaker-do-not-build-help.patch | 12 +--- ...o-not-execute-target-program-while-cross-.patch | 12 +--- ...006-pacemaker-do-not-use-libgnutls-config.patch | 22 +- .../pacemaker/pacemaker/fix_missing_qb_array.patch | 21 - .../pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch | 6 ++ .../recipes-cgl/pacemaker/pacemaker_1.1.16.bb | 1 - 9 files changed, 40 insertions(+), 70 deletions(-) mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0004-pacemaker-do-not-build-help.patch mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/fix_missing_qb_array.patch mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch old mode 100755 new mode 100644 index ea9380e..c27052d --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch @@ -1,18 +1,19 @@ -From a6b792b9abb26e810ad9ca11be31998c7e97db6c Mon Sep 17 00:00:00 2001 +From a55e235f56bc6e894e79fa200c39678e06ef985e Mon Sep 17 00:00:00 2001 From: Bian Naimeng Date: Fri, 3 Jul 2015 15:48:58 +0900 -Subject: [PATCH 1/2] pacemaker: fix xml config +Subject: [PATCH] pacemaker: fix xml config Signed-off-by: Bian Naimeng + --- configure.ac | 17 ++--- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac -index 03f543d..25af918 100644 +index 7195f9b..5e420f2 100644 --- a/configure.ac +++ b/configure.ac -@@ -533,7 +533,6 @@ AC_PATH_PROGS(TAR, tar) +@@ -557,7 +557,6 @@ AC_PATH_PROGS(TAR, tar) AC_PATH_PROGS(MD5, md5) AC_PATH_PROGS(TEST, test) AC_PATH_PROGS(PKGCONFIG, pkg-config) @@ -20,7 +21,7 @@ index 03f543d..25af918 100644 AC_PATH_PROGS(VALGRIND_BIN, valgrind, /usr/bin/valgrind) AC_DEFINE_UNQUOTED(VALGRIND_BIN, "$VALGRIND_BIN", Valgrind command) -@@ -779,17 +778,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h) +@@ -807,17 +806,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h) dnl AC_CHECK_HEADERS(netinet/ip6.h) dnl AC_CHECK_HEADERS(netinet/ip_icmp.h) @@ -44,6 +45,3 @@ index 03f543d..25af918 100644 AC_CHECK_HEADERS(libxml/xpath.h) AC_CHECK_HEADERS(libxslt/xslt.h) --- -1.8.4.2 - diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch index ee3c722..83940d1 100644 --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch @@ -1,4 +1,4 @@ -From f2ab529af7ab31d265dd3e9a53e074317982dffd Mon Sep 17 00:00:00 2001 +From 844ec301031b0e6a3000c793906ba476f08a1e65 Mon Sep 17 00:00:00 2001 From: Li xin Date: Wed, 27 Dec 2017 05:20:45 + Subject: [PATCH] pacemaker: search header from STAGING_INCDIR to walkaround @@ -16,15 +16,16 @@ Upstream-Status: pending Signed-off-by: Bian Naimeng Signed-off-by: Li Xin Signed-off-by: Mingli Yu + --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac -index 36ccb01..2eade3c 100644 +index 5e420f2..5d442a5 100644 --- a/configure.ac +++ b/configure.ac -@@ -483,6 +483,9 @@ esac +@@ -484,6 +484,9 @@ esac dnl Eventually remove this if test "$cross_compiling" != "yes"; then CPPFLAGS="$CPPFLAGS -I${prefix}/include/heartbeat" @@ -34,6 +35,3 @@ index 36ccb01..2eade3c 100644 fi AC_SUBST(INIT_EXT) --- -2.11.0 - diff --git
[yocto] [Recipe reporting system] Upgradable recipe name list
This mail was sent out by Recipe reporting system. This message list those recipes which need to be upgraded. If maintainers believe some of them needn't to upgrade at this time, they can fill RECIPE_NO_UPDATE_REASON in respective recipe file to ignore this remainder until newer upstream version was detected. Example: RECIPE_NO_UPDATE_REASON = "Version 2.0 is unstable" You can check the detail information at: http://recipes.yoctoproject.org/ Package Version Upstream version Maintainer NoUpgradeReason --- -- webkitgtk 2.18.6 2.20.1Alexander Kanavin gcr 3.20.0 3.28.0Alexander Kanavin gnome-desktop33.26.2 3.28.1Alexander Kanavin libsecret 0.18.5 0.18.6Alexander Kanavin meson 0.44.1 0.45.1Alexander Kanavin dtc 1.4.51.4.6 Alexander Kanavin bash-completion 2.7 2.8 Alexander Kanavin gobject-introspec... 1.54.1 1.56.1Alexander Kanavin sysprof 3.26.1 3.28.1Alexander Kanavin libidn1.33 1.34 Alexander Kanavin epiphany 3.26.6 3.28.1Alexander Kanavin boost 1.66.0 1.67.0Alexander Kanavin ca-certificates 20170717 20180409 Alexander Kanavin vala 0.38.8 0.40.4Alexander Kanavin bjam-native 1.66.0 1.67.0Alexander Kanavin gtk-doc 1.27 1.28 Alexander Kanavin libaio0.3.110 0.3.111 Alexander Kanavin lighttpd 1.4.48 1.4.49Alexander Kanavin procps3.3.12 3.3.14Alexander Kanavin btrfs-tools 4.13.3 4.16 Alexander Kanavin Waiting for resolution of h... babeltrace1.5.41.5.5 Alexander Kanavin icu 60.2 61.1 Alexander Kanavin apt 1.2.24 1.4.8 Aníbal Limón dpkg 1.18.24 1.19.0.5 Aníbal Limón apt-native1.2.24 1.4.8 Aníbal Limón gstreamer1.0-vaapi1.12.4 1.14.0Anuj Mittal gstreamer1.0-plug... 1.12.4 1.14.0Anuj Mittal gstreamer1.0-rtsp... 1.12.4 1.14.0Anuj Mittal gstreamer1.0-plug... 1.12.4 1.14.0Anuj Mittal gst-validate 1.12.4 1.14.0Anuj Mittal gstreamer1.0-libav1.12.4 1.14.0Anuj Mittal gstreamer1.0-plug... 1.12.4 1.14.0Anuj Mittal gstreamer1.0-plug... 1.12.4 1.14.0Anuj Mittal gstreamer1.0 1.12.4 1.14.0Anuj Mittal gstreamer1.0-omx 1.12.4 1.14.0Anuj Mittal gstreamer1.0-python 1.12.4 1.14.0Anuj Mittal gst-examples 0.0.1+gitX 0.0.1-new-commits... Anuj Mittal mkfontscale 1.1.21.1.3 Armin Kuster xeyes 1.1.11.1.2 Armin Kuster xinit 1.3.41.4.0 Armin Kuster xkbcomp 1.4.01.4.1 Armin Kuster bind 9.10.6 9.12.1Armin Kuster xprop 1.2.21.2.3 Armin Kuster xset 1.2.31.2.4 Armin Kuster xwininfo 1.1.31.1.4 Armin Kuster openssh 7.6p17.7p1 Armin Kuster xf86-video-vesa 2.3.42.4.0 Armin Kuster libxcb1.12 1.13 Armin Kuster libxshmfence 1.2 1.3 Armin Kuster xkeyboard-config 2.22 2.23.1Armin Kuster calibrateproto0.0+gitX 0.0-new-commits-a... Armin Kuster xcb-proto 1.12 1.13 Armin Kuster util-macros 1.19.1 1.19.2Armin Kuster xserver-xorg 1.19.6 1.19.99.904 Armin Kuster curl 7.58.0 7.59.0Armin Kuster busybox 1.27.2 1.28.3Armin Kuster gnutls3.6.13.6.2
Re: [yocto] [meta-cgl][PATCH 2/3] pacemaker: refresh patches to fix QA warning
在 2018年04月16日 10:26, Anuj Mittal 写道: Hi Yi On 04/16/2018 09:57 AM, Yi Zhao wrote: + +diff --git a/lib/common/mainloop.c b/lib/common/mainloop.c +index 385ca7d..c259c7c 100644 +--- a/lib/common/mainloop.c b/lib/common/mainloop.c @@ -32,6 +32,7 @@ #include #include #include +#include - struct mainloop_child_s { - pid_t pid; + #include + It looks like this patch is no longer required and is just adding the same thing twice. Please check. Thanks. You are right. I will send V2. //Yi -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-cgl][PATCH 2/3] pacemaker: refresh patches to fix QA warning
Hi Yi On 04/16/2018 09:57 AM, Yi Zhao wrote: > + > +diff --git a/lib/common/mainloop.c b/lib/common/mainloop.c > +index 385ca7d..c259c7c 100644 > +--- a/lib/common/mainloop.c > b/lib/common/mainloop.c > @@ -32,6 +32,7 @@ > #include > #include > #include > +#include > > - struct mainloop_child_s { > - pid_t pid; > + #include > + It looks like this patch is no longer required and is just adding the same thing twice. Please check. -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-cgl][PATCH 3/3] resource-agents: refresh patches to fix QA warning
Refresh patches with devtool command to fix do_patch warning. Signed-off-by: Yi Zhao--- .../resource-agents/01-disable-doc-build.patch| 9 + .../02-set-OCF_ROOT_DIR-to-libdir-ocf.patch | 13 +++-- .../resource-agents/03-fix-header-defs-lookup.patch | 11 ++- .../resource-agents/fix-install-sh-not-found.patch| 19 +-- ...x-builds-when-srcdir-and-builddir-are-sepera.patch | 6 ++ 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/01-disable-doc-build.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/01-disable-doc-build.patch index 3fce743..7c67ecc 100644 --- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/01-disable-doc-build.patch +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/01-disable-doc-build.patch @@ -1,6 +1,10 @@ -disable doc build +From 20aca585d2f3273adc36ed0d795716fa6b29524f Mon Sep 17 00:00:00 2001 +From: Bian Naimeng +Date: Tue, 30 Jun 2015 16:42:48 +0800 +Subject: [PATCH] disable doc build Signed-off-by: Bian Naimeng + --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -18,6 +22,3 @@ index 1769c6e..d66b2ae 100644 LINUX_HA = without else LINUX_HA = with --- -1.8.3.1 - diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/02-set-OCF_ROOT_DIR-to-libdir-ocf.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/02-set-OCF_ROOT_DIR-to-libdir-ocf.patch index 4a8ac64..683f3db 100644 --- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/02-set-OCF_ROOT_DIR-to-libdir-ocf.patch +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/02-set-OCF_ROOT_DIR-to-libdir-ocf.patch @@ -1,15 +1,19 @@ -Set OCF_ROOT_DIR to ${libdir}/ocf +From a62bfe802361b9b3b212afa9e2fa488a3435a0f9 Mon Sep 17 00:00:00 2001 +From: Bian Naimeng +Date: Tue, 30 Jun 2015 16:42:48 +0800 +Subject: [PATCH] Set OCF_ROOT_DIR to ${libdir}/ocf Signed-off-by: Bian Naimeng + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index bb45717..3326b53 100644 +index 3bb0b7d..ca30182 100644 --- a/configure.ac +++ b/configure.ac -@@ -406,7 +406,7 @@ dnl Variables needed for substitution +@@ -405,7 +405,7 @@ dnl Variables needed for substitution AC_CHECK_HEADERS(heartbeat/glue_config.h) if test "$ac_cv_header_heartbeat_glue_config_h" = "yes"; then @@ -18,6 +22,3 @@ index bb45717..3326b53 100644 else enable_libnet=no fi --- -1.8.3.1 - diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/03-fix-header-defs-lookup.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/03-fix-header-defs-lookup.patch index f1d3924..0ef2b45 100644 --- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/03-fix-header-defs-lookup.patch +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/03-fix-header-defs-lookup.patch @@ -1,12 +1,16 @@ -fix header defs lookup +From 6a8ec0557194fb5071503de95f2160361ae3427e Mon Sep 17 00:00:00 2001 +From: Bian Naimeng +Date: Tue, 1 Apr 2014 16:20:39 +0200 +Subject: [PATCH] fix header defs lookup Signed-off-by: Bian Naimeng + --- configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 3326b53..8b5706a 100644 +index ca30182..83a698d 100644 --- a/configure.ac +++ b/configure.ac @@ -140,9 +140,8 @@ extract_header_define() { @@ -21,6 +25,3 @@ index 3326b53..8b5706a 100644 AC_MSG_RESULT($value) printf $value rm -f ${Cfile}.c ${Cfile} --- -1.8.3.1 - diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch index 102b797..fbded10 100644 --- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch @@ -1,23 +1,25 @@ -configure.ac: fix install-sh not found +From 59dd32d063ca09a64e371768d7fc74a9954aa717 Mon Sep 17 00:00:00 2001 +From: William Grant +Date: Fri, 9 Jun 2017 09:10:02 +0800 +Subject: [PATCH] configure.ac: fix install-sh not found Fix configure.ac to cope with new autoconf. Recent autoconfs generate a bad configure when AM_INIT_AUTOMAKE is called as late as it was, ending up thinking that the am_aux_dir is pwd at the start of the build. Move it up to under AC_INIT to fix that. -Author: William Grant
[yocto] [meta-cgl][PATCH 2/3] pacemaker: refresh patches to fix QA warning
Refresh patches with devtool command to fix do_patch warning. Signed-off-by: Yi Zhao--- .../pacemaker/0001-pacemaker-fix-xml-config.patch | 14 ++ ...earch-header-from-STAGING_INCDIR-to-walka.patch | 10 -- .../0003-pacemaker-fix-header-defs-lookup.patch| 12 +--- .../0004-pacemaker-do-not-build-help.patch | 12 +--- ...o-not-execute-target-program-while-cross-.patch | 12 +--- ...006-pacemaker-do-not-use-libgnutls-config.patch | 22 +- .../pacemaker/pacemaker/fix_missing_qb_array.patch | 21 ++--- .../pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch | 6 ++ 8 files changed, 54 insertions(+), 55 deletions(-) mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0004-pacemaker-do-not-build-help.patch mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch old mode 100755 new mode 100644 index ea9380e..c27052d --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch @@ -1,18 +1,19 @@ -From a6b792b9abb26e810ad9ca11be31998c7e97db6c Mon Sep 17 00:00:00 2001 +From a55e235f56bc6e894e79fa200c39678e06ef985e Mon Sep 17 00:00:00 2001 From: Bian Naimeng Date: Fri, 3 Jul 2015 15:48:58 +0900 -Subject: [PATCH 1/2] pacemaker: fix xml config +Subject: [PATCH] pacemaker: fix xml config Signed-off-by: Bian Naimeng + --- configure.ac | 17 ++--- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac -index 03f543d..25af918 100644 +index 7195f9b..5e420f2 100644 --- a/configure.ac +++ b/configure.ac -@@ -533,7 +533,6 @@ AC_PATH_PROGS(TAR, tar) +@@ -557,7 +557,6 @@ AC_PATH_PROGS(TAR, tar) AC_PATH_PROGS(MD5, md5) AC_PATH_PROGS(TEST, test) AC_PATH_PROGS(PKGCONFIG, pkg-config) @@ -20,7 +21,7 @@ index 03f543d..25af918 100644 AC_PATH_PROGS(VALGRIND_BIN, valgrind, /usr/bin/valgrind) AC_DEFINE_UNQUOTED(VALGRIND_BIN, "$VALGRIND_BIN", Valgrind command) -@@ -779,17 +778,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h) +@@ -807,17 +806,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h) dnl AC_CHECK_HEADERS(netinet/ip6.h) dnl AC_CHECK_HEADERS(netinet/ip_icmp.h) @@ -44,6 +45,3 @@ index 03f543d..25af918 100644 AC_CHECK_HEADERS(libxml/xpath.h) AC_CHECK_HEADERS(libxslt/xslt.h) --- -1.8.4.2 - diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch index ee3c722..83940d1 100644 --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch @@ -1,4 +1,4 @@ -From f2ab529af7ab31d265dd3e9a53e074317982dffd Mon Sep 17 00:00:00 2001 +From 844ec301031b0e6a3000c793906ba476f08a1e65 Mon Sep 17 00:00:00 2001 From: Li xin Date: Wed, 27 Dec 2017 05:20:45 + Subject: [PATCH] pacemaker: search header from STAGING_INCDIR to walkaround @@ -16,15 +16,16 @@ Upstream-Status: pending Signed-off-by: Bian Naimeng Signed-off-by: Li Xin Signed-off-by: Mingli Yu + --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac -index 36ccb01..2eade3c 100644 +index 5e420f2..5d442a5 100644 --- a/configure.ac +++ b/configure.ac -@@ -483,6 +483,9 @@ esac +@@ -484,6 +484,9 @@ esac dnl Eventually remove this if test "$cross_compiling" != "yes"; then CPPFLAGS="$CPPFLAGS -I${prefix}/include/heartbeat" @@ -34,6 +35,3 @@ index 36ccb01..2eade3c 100644 fi AC_SUBST(INIT_EXT) --- -2.11.0 - diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch old mode 100755 new mode 100644 index 939ecab..6dc4663 --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch
[yocto] [meta-cgl][PATCH 1/3] crmsh: refresh patch to fix QA warning
Refresh patch with devtool command to fix do_patch warning. Signed-off-by: Yi Zhao--- .../recipes-cgl/crmsh/crmsh/tweaks_for_build.patch| 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/meta-cgl-common/recipes-cgl/crmsh/crmsh/tweaks_for_build.patch b/meta-cgl-common/recipes-cgl/crmsh/crmsh/tweaks_for_build.patch index f465c82..203527a 100644 --- a/meta-cgl-common/recipes-cgl/crmsh/crmsh/tweaks_for_build.patch +++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh/tweaks_for_build.patch @@ -1,3 +1,8 @@ +From 11704324287f9f552e1524f4a680b8744abd0361 Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Fri, 9 Jun 2017 11:04:56 +0800 +Subject: [PATCH] crmsh: disable network access for xsltproc when building + Upstream-Status: Inappropriate [embedded specific] Pass option '--catalogs' to xsltproc via a2x to avoid network access. @@ -7,12 +12,16 @@ Add option '--install-lib' of python setup.py to install python libraries to right place. Signed-off-by: Kai Kang + --- + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + diff --git a/Makefile.am b/Makefile.am -index d89affb..0f2361f 100644 +index 1ffe9c3..3d045e7 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -47,7 +47,7 @@ endif +@@ -45,7 +45,7 @@ endif $(ASCIIDOC) --unsafe --backend=xhtml11 $< %.8: %.8.adoc @@ -21,11 +30,11 @@ index d89affb..0f2361f 100644 # Shared data files install-data-hook: -@@ -79,6 +79,7 @@ install-exec-local: - -mkdir -p $(DESTDIR)$(pkgpythondir) +@@ -73,6 +73,7 @@ install-exec-local: $(PYTHON) $(srcdir)/setup.py install \ + --root $(DESTDIR)/// \ $(python_prefix) \ + --install-lib $(pythondir) \ --record $(DESTDIR)$(pkgpythondir)/install_files.txt \ --verbose - $(INSTALL) -d -m 770 $(DESTDIR)/$(CRM_CACHE_DIR) + $(INSTALL) -d -m 770 $(DESTDIR)$(CRM_CACHE_DIR) -- 2.7.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [linux-yocto] [PATCH 1/2] netatop: Initial integration
On 2018-04-14 11:27 AM, He Zhe wrote: On 2018年04月10日 03:19, Bruce Ashfield wrote: On 2018-04-05 3:08 PM, Bruce Ashfield wrote: On 2018-03-28 11:25 PM, He Zhe wrote: This is a net statistics collector for atop from: http://atoptool.nl/netatop.php https://atoptool.nl/download/netatop-2.0.tar.gz Two changes: Adjust pathes for netatop.h and netatopversion.h Add module_init and module_exit Which kernel versions have you tested this on ? Is there a way we could get a README that describes how to build and test it ? Also, is there a recipe that builds this that I can see/test ? Sorry for slow reply, I'm on vacation and will handle this asap. Is this expected to be built as a module via a recipe? Or as a patch/feature in yocto-kernel-cache? I'd expect something like the perf recipe to build this directly from the source tree. That recipe can live wherever, i.e. a github based meta-layer, but it should be available so that others can see how to build the code. Bruce Zhe Bruce Bruce Signed-off-by: He Zhe--- drivers/staging/netatop/netatop.c | 1843 ++ drivers/staging/netatop/netatop.h | 47 + drivers/staging/netatop/netatopversion.h | 2 + 3 files changed, 1892 insertions(+) create mode 100644 drivers/staging/netatop/netatop.c create mode 100644 drivers/staging/netatop/netatop.h create mode 100644 drivers/staging/netatop/netatopversion.h diff --git a/drivers/staging/netatop/netatop.c b/drivers/staging/netatop/netatop.c new file mode 100644 index ..3baa6520416a --- /dev/null +++ b/drivers/staging/netatop/netatop.c @@ -0,0 +1,1843 @@ +/* +** This module uses the netfilter interface to maintain statistics +** about the network traffic per task, on level of thread group +** and individual thread. +** +** General setup +** - +** Once the module is active, it is called for every packet that is +** transmitted by a local process and every packet that is received +** from an interface. Not only the packets that contain the user data +** are passed but also the TCP related protocol packets (SYN, ACK, ...). +** +** When the module discovers a packet for a connection (TCP) or local +** port (UDP) that is new, it creates a sockinfo structure. As soon as +** possible the sockinfo struct will be connected to a taskinfo struct +** that represents the proces or thread that is related to the socket. +** However, the task can only be determined when a packet is transmitted, +** i.e. the module is called during system call handling in the context +** of the transmitting process. At that moment the tgid (process) and +** pid (thread) can be obtained from the process administration to +** be stored in the module's own taskinfo structs (one for the process, +** one for the thread). +** For the time that the sockinfo struct can not be related to a taskinfo +** struct (e.g. when only packets are received), counters are maintained +** temporarily in the sockinfo struct. As soon as a related taskinfo struct +** is discovered when the task transmits, counters will be maintained in +** the taskinfo struct itself. +** When packets are only received for a socket (e.g. another machine is +** sending UDP packets to the local machine) while the local task +** never responds, no match to a process can be made and the packets +** remain unidentified by the netatop module. At least one packet should +** have been sent by a local process to be able to match packets for such +** socket. +** In the file /proc/netatop counters can be found that show the total +** number of packets sent/received and how many of these packets were +** unidentified (i.e. not accounted to a process/thread). +** +** Garbage collection +** -- +** The module uses a garbage collector to cleanup the unused sockinfo +** structs if connections do not exist any more (TCP) or have not been +** used for some time (TCP/UDP). +** Furthermore, the garbage collector checks if the taskinfo structs +** still represent existing processes or threads. If not, the taskinfo struct +** is destroyed (in case of a thread) or it is moved to a separate list of +** finished processes (in case of a process). Analysis programs can read +** the taskinfo of such finished process. When the taskinfo of a finished +** process is not read within 15 seconds, the taskinfo will be destroyed. +** +** A garbage collector cycle can be triggered by issueing a getsockopt +** call from an analysis program (e.g. atop). Apart from that, a time-based +** garbage collector cycle is issued anyhow every 15 seconds by the +** knetatop kernel thread. +** +** Interface with user mode +** +** Programs can open an IP socket and use the getsockopt() system call +** to issue commands to this module. With the command ATOP_GETCNT_TGID +** the current counters can be obtained on process level (thread group) +** and with the command ATOP_GETCNT_PID
Re: [yocto] Getting the version of Yocto that is being used.
I like: https://git.yoctoproject.org/cgit.cgi/poky/plain/meta/classes/image-buildinfo.bbclass Philip On 04/12/2018 08:47 AM, Burton, Ross wrote: > I think the message here is that we need to embed the oe-core version > in the metadata somewhere... > > On 12 April 2018 at 13:11, Richard Collins >wrote: >> I get the following for DISTRO. >> >> DISTRO= "yogurt" >> DISTRO_VERSION= "BSP-Yocto-RK3288-PD17.1.1" >> >> Can't find any reference to yogurt so I assume this is something the >> supplier of our SOM's has done. Looking on their Wiki it seems to be based >> on 2.1.2 (Krogoth) >> >> >> Thanks for the help. :) >> >> On 12 April 2018 at 11:21, Alexander Kanavin >> wrote: >>> >>> On 04/12/2018 12:44 PM, Richard Collins wrote: I've inherited a Yocto project that I know to be an old version. So one of my tasks is to update to the latest version. Before I do this I would like to know what version I have. The only information I can find is the bitbake version, BB_VERSION= "1.32.0". >>> >>> >>> When you run bitbake, it should also print the values of DISTRO and >>> DISTRO_VERSION. Those should give a clue where you are at. >>> >>> Alex >> >> >> >> -- >> ___ >> yocto mailing list >> yocto@yoctoproject.org >> https://lists.yoctoproject.org/listinfo/yocto >> -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto