[yocto] [PATCH] iucode-tool: add a service file (systemd)
From: Changqing Li
Add a service file (systemd), so that the microcode can be uploaded
automatically
Signed-off-by: Changqing Li
---
recipes-core/microcode/iucode-tool/iucode-tool.service | 11 +++
recipes-core/microcode/iucode-tool_2.3.1.bb| 17 +++--
2 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 recipes-core/microcode/iucode-tool/iucode-tool.service
diff --git a/recipes-core/microcode/iucode-tool/iucode-tool.service
b/recipes-core/microcode/iucode-tool/iucode-tool.service
new file mode 100644
index 000..6b134c3
--- /dev/null
+++ b/recipes-core/microcode/iucode-tool/iucode-tool.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Apply Cpu Microcode
+
+[Service]
+Type=oneshot
+KillMode=process
+RemainAfterExit=yes
+ExecStart=@SBINDIR@/iucode_tool -k @LIB@/firmware/intel-ucode/microcode.bin
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-core/microcode/iucode-tool_2.3.1.bb
b/recipes-core/microcode/iucode-tool_2.3.1.bb
index df74a8e..1762468 100644
--- a/recipes-core/microcode/iucode-tool_2.3.1.bb
+++ b/recipes-core/microcode/iucode-tool_2.3.1.bb
@@ -18,16 +18,29 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
DEPENDS_append_libc-musl = " argp-standalone"
-SRC_URI =
"https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_${PV}.tar.xz";
+SRC_URI =
"https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_${PV}.tar.xz \
+ file://iucode-tool.service \
+ "
SRC_URI_append_libc-musl = "
file://0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch"
SRC_URI[md5sum] = "63b33cc0ea1f8c73b443412abbf39d6f"
SRC_URI[sha256sum] =
"12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95"
-inherit autotools
+inherit autotools systemd
BBCLASSEXTEND = "native"
COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
UPSTREAM_CHECK_URI = "https://gitlab.com/iucode-tool/releases";
+
+
+SYSTEMD_SERVICE_${PN} = "iucode-tool.service"
+SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+
+do_install_append() {
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/iucode-tool.service
${D}${systemd_unitdir}/system
+ sed -i -e 's,@SBINDIR@,${sbindir},g'
${D}${systemd_unitdir}/system/iucode-tool.service
+ sed -i -e 's,@LIB@,${base_libdir},g'
${D}${systemd_unitdir}/system/iucode-tool.service
+}
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] pacemaker: remove depend on openais
From: Changqing Li
corosync 1.x have removed from meta-cgl, and use corosync under
meta-networking.
corosync 2.x can replace corosync 1.x + openais (in meta-cgl),
so remove depend on openais
Signed-off-by: Changqing Li
---
meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
index 9aeb1fb..8726111 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.clusterlabs.org";
LICENSE = "GPLv2+ & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=19a64afd3a35d044a80579d7aafc30ff"
-DEPENDS = "corosync libxslt openais libxml2 gnutls resource-agents libqb
python-native"
+DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python-native"
SRC_URI = "https://github.com/ClusterLabs/${BPN}/archive/Pacemaker-${PV}.zip \
file://0001-pacemaker-fix-xml-config.patch \
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-cgl] pacemaker: remove depend on openais
From: Changqing Li
corosync 1.x have removed from meta-cgl, and use corosync under
meta-networking.
corosync 2.x can replace corosync 1.x + openais (in meta-cgl),
so remove depend on openais
Signed-off-by: Changqing Li
---
meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
index 9aeb1fb..8726111 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.clusterlabs.org";
LICENSE = "GPLv2+ & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=19a64afd3a35d044a80579d7aafc30ff"
-DEPENDS = "corosync libxslt openais libxml2 gnutls resource-agents libqb
python-native"
+DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python-native"
SRC_URI = "https://github.com/ClusterLabs/${BPN}/archive/Pacemaker-${PV}.zip \
file://0001-pacemaker-fix-xml-config.patch \
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-cgl] libmailtools-perl: 2.18 -> 2.20
From: Changqing Li
License-Update: copyright year update
Signed-off-by: Changqing Li
---
.../perl/{libmailtools-perl_2.18.bb => libmailtools-perl_2.20.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-cgl-common/recipes-perl/perl/{libmailtools-perl_2.18.bb =>
libmailtools-perl_2.20.bb} (78%)
diff --git a/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.18.bb
b/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.20.bb
similarity index 78%
rename from meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.18.bb
rename to meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.20.bb
index 07128e0..dec7979 100644
--- a/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.18.bb
+++ b/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.20.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "MailTools is a set of Perl modules related to
mail applications"
HOMEPAGE = "http://search.cpan.org/dist/MailTools/";
SECTION = "libs"
LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM =
"file://lib/Mail/Mailer.pod;beginline=144;md5=93c9027e72612b3555f857c4fc17b953"
+LIC_FILES_CHKSUM =
"file://lib/Mail/Mailer.pod;beginline=144;md5=641bd171b1aaabba1fc83ac0a98a2d30"
DEPENDS = " \
libtest-pod-perl-native \
libtimedate-perl-native \
@@ -18,8 +18,8 @@ BBCLASSEXTEND = "native"
PR = "r2"
SRC_URI =
"http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MailTools-${PV}.tar.gz";
-SRC_URI[md5sum] = "972468ab5207b90398d77bed4ffc361d"
-SRC_URI[sha256sum] =
"dfee9e770257371112f20d978e637759e81bc4f19e97b083585c71ecab37b527"
+SRC_URI[md5sum] = "53e9d35256c3fd7cef0e4a24b15e9512"
+SRC_URI[sha256sum] =
"f55606f7a9cc342ee9d5f996e2b6a4c0047e2ee47cd88c3250ecf0d0c5fb3196"
S = "${WORKDIR}/MailTools-${PV}"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-cgl] libsocket6-perl: 0.23 -> 0.28
From: Changqing Li
License-Update: copyright year update
Signed-off-by: Changqing Li
---
.../0001-socket6-perl-fix-configure-error.patch| 34 ++
...ocket6-perl_0.23.bb => libsocket6-perl_0.28.bb} | 10 ---
2 files changed, 40 insertions(+), 4 deletions(-)
create mode 100644
meta-cgl-common/recipes-perl/perl/libsocket6-perl/0001-socket6-perl-fix-configure-error.patch
rename meta-cgl-common/recipes-perl/perl/{libsocket6-perl_0.23.bb =>
libsocket6-perl_0.28.bb} (72%)
diff --git
a/meta-cgl-common/recipes-perl/perl/libsocket6-perl/0001-socket6-perl-fix-configure-error.patch
b/meta-cgl-common/recipes-perl/perl/libsocket6-perl/0001-socket6-perl-fix-configure-error.patch
new file mode 100644
index 000..07745c8
--- /dev/null
+++
b/meta-cgl-common/recipes-perl/perl/libsocket6-perl/0001-socket6-perl-fix-configure-error.patch
@@ -0,0 +1,34 @@
+From b33a6a83687fc58cd5f662d44ba8819498cb80a4 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 9 Aug 2018 14:10:32 +0800
+Subject: [PATCH] socket6-perl: fix configure error
+
+only do IPv6_CHECK_INET_NTOP when not cross compile to fix below
+error: checking for working inet_ntop..., configure: error:
+cannot run test program while cross compiling
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Changqing Li
+---
+ configure.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 1fe22e1..1a7cf94 100644
+--- a/configure.in
b/configure.in
+@@ -63,7 +63,9 @@ if test $ac_cv_lib_inet6_getaddrinfo = yes; then
+ INET6LIBS="-L$ipv6_cv_dir/lib -linet6"
+ fi
+
+-IPv6_CHECK_INET_NTOP()
++if test "$cross_compiling" != yes; then
++ IPv6_CHECK_INET_NTOP()
++fi
+ IPv6_CHECK_SA_LEN()
+ IPv6_CHECK_SIN6_SCOPE_ID()
+ IPv6_CHECK_SOCKLEN_T()
+--
+2.7.4
+
diff --git a/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.23.bb
b/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.28.bb
similarity index 72%
rename from meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.23.bb
rename to meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.28.bb
index 5ab0f4a..f76ff22 100644
--- a/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.23.bb
+++ b/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.28.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Perl extensions for IPv6"
HOMEPAGE = "https://metacpan.org/release/Socket6";
SECTION = "libs"
LICENSE = "BSD"
-LIC_FILES_CHKSUM =
"file://README;beginline=31;md5=ad207d410de6d8ca6b4655469baa1ab4"
+LIC_FILES_CHKSUM =
"file://README;beginline=31;md5=aa15b0e3744ac40eaada8738eccd24df"
PR = "r2"
BBCLASSEXTEND = "native"
@@ -10,9 +10,11 @@ BBCLASSEXTEND = "native"
CFLAGS += "-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
BUILD_CFLAGS += "-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-SRC_URI =
"http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-${PV}.tar.gz;name=socket6-perl-${PV}";
-SRC_URI[socket6-perl-0.23.md5sum] = "2c02adb13c449d48d232bb704ddbd492"
-SRC_URI[socket6-perl-0.23.sha256sum] =
"eda753f0197e8c3c8d4ab20a634561ce84011fa51aa5ff40d4dbcb326ace0833"
+SRC_URI =
"http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-${PV}.tar.gz;name=socket6-perl-${PV}
\
+ file://0001-socket6-perl-fix-configure-error.patch \
+"
+SRC_URI[socket6-perl-0.28.md5sum] = "aa8489135a3dbcec6233396e1aeb043b"
+SRC_URI[socket6-perl-0.28.sha256sum] =
"bfd49ab99f3197c99285fed4683c4edc06277c1e4453f593e694d7bff0974586"
S = "${WORKDIR}/Socket6-${PV}"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-cgl] crmsh: 2.3.2 -> 3.0.3
From: Changqing Li
Signed-off-by: Changqing Li
---
meta-cgl-common/recipes-cgl/crmsh/{crmsh_2.3.2.bb => crmsh_3.0.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-cgl-common/recipes-cgl/crmsh/{crmsh_2.3.2.bb => crmsh_3.0.3.bb}
(87%)
diff --git a/meta-cgl-common/recipes-cgl/crmsh/crmsh_2.3.2.bb
b/meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb
similarity index 87%
rename from meta-cgl-common/recipes-cgl/crmsh/crmsh_2.3.2.bb
rename to meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb
index 709fbff..b28a826 100644
--- a/meta-cgl-common/recipes-cgl/crmsh/crmsh_2.3.2.bb
+++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb
@@ -17,8 +17,8 @@ SRC_URI =
"https://github.com/ClusterLabs/crmsh/archive/${PV}.tar.gz;downloadfil
file://tweaks_for_build.patch \
"
-SRC_URI[md5sum] = "0a475d3c56a158dc991de61a26450eb5"
-SRC_URI[sha256sum] =
"ac78b7786f6a52cc3d86b3d80b2d8627e84873330cd4846d5ea48869189ad864"
+SRC_URI[md5sum] = "563b463155a652820c8d1319418e88b7"
+SRC_URI[sha256sum] =
"364fadb0d0c9619676e10bb75f4ea833a49019aa77ddb26229bc9d1c435585c0"
inherit autotools-brokensep distutils-base
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-cgl] libwww-perl: 6.05 -> 6.35
From: Changqing Li
License-Update: license file change from README to LICENSE
Signed-off-by: Changqing Li
---
.../perl/{libwww-perl_6.05.bb => libwww-perl_6.35.bb} | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta-cgl-common/recipes-perl/perl/{libwww-perl_6.05.bb =>
libwww-perl_6.35.bb} (50%)
diff --git a/meta-cgl-common/recipes-perl/perl/libwww-perl_6.05.bb
b/meta-cgl-common/recipes-perl/perl/libwww-perl_6.35.bb
similarity index 50%
rename from meta-cgl-common/recipes-perl/perl/libwww-perl_6.05.bb
rename to meta-cgl-common/recipes-perl/perl/libwww-perl_6.35.bb
index 21f9df4..b986b4e 100644
--- a/meta-cgl-common/recipes-perl/perl/libwww-perl_6.05.bb
+++ b/meta-cgl-common/recipes-perl/perl/libwww-perl_6.35.bb
@@ -1,8 +1,8 @@
DESCRIPTION = "libwww-perl provides a simple and consistent API to the World
Wide Web"
-HOMEPAGE = "http://search.cpan.org/dist/libwww-perl/";
+HOMEPAGE = "https://metacpan.org/release/libwww-perl";
SECTION = "libs"
LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM =
"file://README;beginline=92;endline=98;md5=3da13bc02f8f17ed35ac5d192cae6fe4"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=225d44a95fa3addb1da6d91187ab189f"
DEPENDS = "liburi-perl-native libhtml-parser-perl-native
libhtml-tagset-perl-native"
RDEPENDS_${PN} += " \
libhtml-parser-perl \
@@ -15,9 +15,9 @@ BBCLASSEXTEND = "native"
PR = "r2"
-SRC_URI =
"http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz;name=libwww-perl-${PV}";
-SRC_URI[libwww-perl-6.05.md5sum] = "637d5f1eb61336ca2caa6e026b382f87"
-SRC_URI[libwww-perl-6.05.sha256sum] =
"7b25799ff7eec18e8e4e97dc0cad7b2a5b433b50b13feb59d9179173bee78f23"
+SRC_URI =
"https://cpan.metacpan.org/authors/id/E/ET/ETHER/libwww-perl-${PV}.tar.gz;name=libwww-perl-${PV}";
+SRC_URI[libwww-perl-6.35.md5sum] = "19cd0f55f61359c973caa9301ec405bd"
+SRC_URI[libwww-perl-6.35.sha256sum] =
"dda2578d7b32152c4afce834761a61d117de286c705a9f7972c7ac6032ca5953"
S = "${WORKDIR}/libwww-perl-${PV}"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-cgl] monit: 5.20.0 -> 5.25.2
From: Changqing Li
Signed-off-by: Changqing Li
---
.../recipes-cgl/monit/{monit_5.20.0.bb => monit_5.25.2.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-cgl-common/recipes-cgl/monit/{monit_5.20.0.bb => monit_5.25.2.bb}
(91%)
diff --git a/meta-cgl-common/recipes-cgl/monit/monit_5.20.0.bb
b/meta-cgl-common/recipes-cgl/monit/monit_5.25.2.bb
similarity index 91%
rename from meta-cgl-common/recipes-cgl/monit/monit_5.20.0.bb
rename to meta-cgl-common/recipes-cgl/monit/monit_5.25.2.bb
index 955a28c..ab9e922 100644
--- a/meta-cgl-common/recipes-cgl/monit/monit_5.20.0.bb
+++ b/meta-cgl-common/recipes-cgl/monit/monit_5.25.2.bb
@@ -9,7 +9,7 @@ HOMEPAGE = "http://mmonit.com/monit/";
LICENSE = "AGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
-DEPENDS = "openssl"
+DEPENDS = "openssl zlib"
SRC_URI = "\
http://mmonit.com/monit/dist/${BP}.tar.gz \
@@ -17,8 +17,8 @@ SRC_URI = "\
file://init \
"
-SRC_URI[md5sum] = "769a44ee13b4e1f90156b58dc2f7ea7c"
-SRC_URI[sha256sum] =
"ebac395ec50c1ae64d568db1260bc049d0e0e624c00e79d7b1b9a59c2679b98d"
+SRC_URI[md5sum] = "890df599d6c1e9cfbbdd3edbacb7db81"
+SRC_URI[sha256sum] =
"aa0ce6361d1155e43e30a86dcff00b2003d434f221c360981ced830275abc64a"
INITSCRIPT_NAME = "monit"
INITSCRIPT_PARAMS = "defaults 99"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-cgl] libtest-pod-perl: 1.51 -> 1.52
From: Changqing Li
Signed-off-by: Changqing Li
---
.../perl/{libtest-pod-perl_1.51.bb => libtest-pod-perl_1.52.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-cgl-common/recipes-perl/perl/{libtest-pod-perl_1.51.bb =>
libtest-pod-perl_1.52.bb} (78%)
diff --git a/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.51.bb
b/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb
similarity index 78%
rename from meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.51.bb
rename to meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb
index 230576f..ff5538e 100644
--- a/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.51.bb
+++ b/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb
@@ -12,8 +12,8 @@ RDEPENDS_${PN} += " perl-module-test-more \
PR = "r2"
SRC_URI
="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Test-Pod-${PV}.tar.gz;name=test-pod-perl-${PV}";
-SRC_URI[test-pod-perl-1.51.md5sum] = "f806aa84de2f0c0fba48b3a5a8a4aecf"
-SRC_URI[test-pod-perl-1.51.sha256sum] =
"c1a1d3cedf4a579e3aad89c36f9878a8542b6656dbe71f1581420f49582d7efb"
+SRC_URI[test-pod-perl-1.52.md5sum] = "472dda77746d48e6465bf62e47aeca81"
+SRC_URI[test-pod-perl-1.52.sha256sum] =
"60a8dbcc60168bf1daa5cc2350236df9343e9878f4ab9830970a5dde6fe8e5fc"
S = "${WORKDIR}/Test-Pod-${PV}"
inherit cpan
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-cgl] pacemaker: upgrade 1.1.16 -> 1.1.19
From: Changqing Li
Signed-off-by: Changqing Li
---
...-pacemaker-fix-compile-error-of-musl-libc.patch | 56 ++
.../pacemaker/0001-pacemaker-fix-xml-config.patch | 19 +---
.../{pacemaker_1.1.16.bb => pacemaker_1.1.19.bb} | 7 ++-
3 files changed, 73 insertions(+), 9 deletions(-)
create mode 100644
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.16.bb =>
pacemaker_1.1.19.bb} (94%)
diff --git
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
new file mode 100644
index 000..f8cbb7e
--- /dev/null
+++
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
@@ -0,0 +1,56 @@
+From 51b0df9242bb1e3eb41362381472a00727910f64 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Fri, 10 Aug 2018 15:08:31 +0800
+Subject: [PATCH] pacemaker: fix compile error of musl libc
+
+Upstream-Status: Pending
+
+Signed-off-by: Changqing Li
+---
+ include/crm/stonith-ng.h | 1 +
+ lib/cib/cib_remote.c | 3 ---
+ tools/crm_mon.c | 2 +-
+ 3 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/include/crm/stonith-ng.h b/include/crm/stonith-ng.h
+index 56c1ec7..a637b47 100644
+--- a/include/crm/stonith-ng.h
b/include/crm/stonith-ng.h
+@@ -28,6 +28,7 @@
+ # include
+ # include
+ # include
++# include
+
+ /* TO-DO: Work out how to drop this requirement */
+ # include
+diff --git a/lib/cib/cib_remote.c b/lib/cib/cib_remote.c
+index 4d7b93b..8be8ecc 100644
+--- a/lib/cib/cib_remote.c
b/lib/cib/cib_remote.c
+@@ -53,9 +53,6 @@ typedef void gnutls_session_t;
+ #endif
+
+ #include
+-#ifndef ON_BSD
+-# include
+-#endif
+
+ #define DH_BITS 1024
+
+diff --git a/tools/crm_mon.c b/tools/crm_mon.c
+index 7c63803..1ae6c21 100644
+--- a/tools/crm_mon.c
b/tools/crm_mon.c
+@@ -553,7 +553,7 @@ main(int argc, char **argv)
+
+ #if !defined (ON_DARWIN) && !defined (ON_BSD)
+ /* prevent zombies */
+-signal(SIGCLD, SIG_IGN);
++signal(SIGCHLD, SIG_IGN);
+ #endif
+
+ if (crm_ends_with_ext(argv[0], ".cgi") == TRUE) {
+--
+2.7.4
+
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
index c27052d..72c3a1e 100644
---
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,27 +1,29 @@
-From a55e235f56bc6e894e79fa200c39678e06ef985e Mon Sep 17 00:00:00 2001
-From: Bian Naimeng
-Date: Fri, 3 Jul 2015 15:48:58 +0900
+From ac1ff1d538d2be205fbcc9676c6497a1395b71d8 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Fri, 10 Aug 2018 14:59:33 +0800
Subject: [PATCH] pacemaker: fix xml config
Signed-off-by: Bian Naimeng
+update to version 1.1.19
+Signed-off-by: Changqing Li
---
configure.ac | 17 ++---
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 7195f9b..5e420f2 100644
+index 3bf1914..345caeb 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -557,7 +557,6 @@ AC_PATH_PROGS(TAR, tar)
+@@ -555,7 +555,6 @@ AC_PATH_PROGS(TAR, tar)
AC_PATH_PROGS(MD5, md5)
AC_PATH_PROGS(TEST, test)
- AC_PATH_PROGS(PKGCONFIG, pkg-config)
+ PKG_PROG_PKG_CONFIG
-AC_PATH_PROGS(XML2CONFIG, xml2-config)
AC_PATH_PROGS(VALGRIND_BIN, valgrind, /usr/bin/valgrind)
AC_DEFINE_UNQUOTED(VALGRIND_BIN, "$VALGRIND_BIN", Valgrind command)
-@@ -807,17 +806,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h)
+@@ -805,17 +804,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h)
dnl AC_CHECK_HEADERS(netinet/ip6.h)
dnl AC_CHECK_HEADERS(netinet/ip_icmp.h)
@@ -45,3 +47,6 @@ index 7195f9b..5e420f2 100644
AC_CHECK_HEADERS(libxml/xpath.h)
AC_CHECK_HEADERS(libxslt/xslt.h)
+--
+2.7.4
+
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
similarity index 94%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
index 8726111..bd3526d 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
@@ -24,8 +24,11 @@ SRC_URI =
"https://github.com/ClusterLabs/${BPN}/archive/Pacemaker-${PV}.zip \
file://volatiles \
file://tmpfiles \
"
-SRC_URI[md5sum] = "6f60f733823d31acbef4556fb749c457"
-SRC_URI[sha256sum] =
"2642264b27c584eff5747a2a34c7f2bff13d52741e4e5cc70f14b2b6cd1fe7d5"
+
+SRC_URI_append_libc-musl =
"file://0001-pacemaker-fix-compile-error-of-musl-libc.patch"
+
+SRC_URI[md5sum] = "deb7017c5a9d
[yocto] [PATCH][meta-dpdk] dpdk-dev-libibverbs: fix do_fetch error
From: Changqing Li
original URI have been deleted(don't know why). I noticed there is
an official libibverbs(https://git.kernel.org/pub/scm/libs/infiniband
/libibverbs.git), but there are big differences with original one.
I don't have condition to test this now, I can only go as far as builds
OK. so I select use tar.gz on yocto to make sure fetch can success and
original function not be affected.
I also noticed a project seems like Mellanox libibverbs,
https://github.com/gpudirect/libibverbs, but it don't have any
official release now.
Hope in the future, we can switch to the offcial libibverbs, or
the new Mellanox libibverbs. but now, we use this yocto tar.gz
as a workaround to make it at least work now.
Signed-off-by: Changqing Li
---
.../dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb
b/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb
index c91a9ef..82979be 100644
---
a/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb
+++
b/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Mellanox/dpdk-dev-libibverbs";
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=7c557f27dd795ba77cc419dddc656b51"
-SRC_URI =
"https://github.com/Mellanox/dpdk-dev-libibverbs/archive/libibverbs-${PV}.tar.gz
\
+SRC_URI = "https://autobuilder.yocto.io/pub/sources/libibverbs-${PV}.tar.gz \
file://init_c.patch \
file://0001-Fix-build-with-clang.patch \
file://0002-typecast-enum-to-int-before-comparison.patch \
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH V2][meta-cgl] pacemaker: Upgrade 1.1.16 -> 1.1.19
From: Changqing Li
1. Upgrade pacemaker to 1.1.19
2. fence_legacy/fence_pcmk in package pacemaker requires
/usr/bin/perl, but no providers found in
RDEPENDS_pacemaker, so add it
Signed-off-by: Changqing Li
---
...-pacemaker-fix-compile-error-of-musl-libc.patch | 56 ++
.../pacemaker/0001-pacemaker-fix-xml-config.patch | 19 +---
.../{pacemaker_1.1.16.bb => pacemaker_1.1.19.bb} | 9 ++--
3 files changed, 74 insertions(+), 10 deletions(-)
create mode 100644
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.16.bb =>
pacemaker_1.1.19.bb} (93%)
diff --git
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
new file mode 100644
index 000..f8cbb7e
--- /dev/null
+++
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
@@ -0,0 +1,56 @@
+From 51b0df9242bb1e3eb41362381472a00727910f64 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Fri, 10 Aug 2018 15:08:31 +0800
+Subject: [PATCH] pacemaker: fix compile error of musl libc
+
+Upstream-Status: Pending
+
+Signed-off-by: Changqing Li
+---
+ include/crm/stonith-ng.h | 1 +
+ lib/cib/cib_remote.c | 3 ---
+ tools/crm_mon.c | 2 +-
+ 3 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/include/crm/stonith-ng.h b/include/crm/stonith-ng.h
+index 56c1ec7..a637b47 100644
+--- a/include/crm/stonith-ng.h
b/include/crm/stonith-ng.h
+@@ -28,6 +28,7 @@
+ # include
+ # include
+ # include
++# include
+
+ /* TO-DO: Work out how to drop this requirement */
+ # include
+diff --git a/lib/cib/cib_remote.c b/lib/cib/cib_remote.c
+index 4d7b93b..8be8ecc 100644
+--- a/lib/cib/cib_remote.c
b/lib/cib/cib_remote.c
+@@ -53,9 +53,6 @@ typedef void gnutls_session_t;
+ #endif
+
+ #include
+-#ifndef ON_BSD
+-# include
+-#endif
+
+ #define DH_BITS 1024
+
+diff --git a/tools/crm_mon.c b/tools/crm_mon.c
+index 7c63803..1ae6c21 100644
+--- a/tools/crm_mon.c
b/tools/crm_mon.c
+@@ -553,7 +553,7 @@ main(int argc, char **argv)
+
+ #if !defined (ON_DARWIN) && !defined (ON_BSD)
+ /* prevent zombies */
+-signal(SIGCLD, SIG_IGN);
++signal(SIGCHLD, SIG_IGN);
+ #endif
+
+ if (crm_ends_with_ext(argv[0], ".cgi") == TRUE) {
+--
+2.7.4
+
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
index c27052d..72c3a1e 100644
---
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,27 +1,29 @@
-From a55e235f56bc6e894e79fa200c39678e06ef985e Mon Sep 17 00:00:00 2001
-From: Bian Naimeng
-Date: Fri, 3 Jul 2015 15:48:58 +0900
+From ac1ff1d538d2be205fbcc9676c6497a1395b71d8 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Fri, 10 Aug 2018 14:59:33 +0800
Subject: [PATCH] pacemaker: fix xml config
Signed-off-by: Bian Naimeng
+update to version 1.1.19
+Signed-off-by: Changqing Li
---
configure.ac | 17 ++---
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 7195f9b..5e420f2 100644
+index 3bf1914..345caeb 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -557,7 +557,6 @@ AC_PATH_PROGS(TAR, tar)
+@@ -555,7 +555,6 @@ AC_PATH_PROGS(TAR, tar)
AC_PATH_PROGS(MD5, md5)
AC_PATH_PROGS(TEST, test)
- AC_PATH_PROGS(PKGCONFIG, pkg-config)
+ PKG_PROG_PKG_CONFIG
-AC_PATH_PROGS(XML2CONFIG, xml2-config)
AC_PATH_PROGS(VALGRIND_BIN, valgrind, /usr/bin/valgrind)
AC_DEFINE_UNQUOTED(VALGRIND_BIN, "$VALGRIND_BIN", Valgrind command)
-@@ -807,17 +806,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h)
+@@ -805,17 +804,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h)
dnl AC_CHECK_HEADERS(netinet/ip6.h)
dnl AC_CHECK_HEADERS(netinet/ip_icmp.h)
@@ -45,3 +47,6 @@ index 7195f9b..5e420f2 100644
AC_CHECK_HEADERS(libxml/xpath.h)
AC_CHECK_HEADERS(libxslt/xslt.h)
+--
+2.7.4
+
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
similarity index 93%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
index 8726111..181c65f 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
@@ -24,8 +24,11 @@ SRC_URI =
"https://github.com/ClusterLabs/${BPN}/archive/Pacemaker-${PV}.zip \
file://volatiles \
file://tmpfiles \
"
-SRC_URI[md5sum] = "6f60f733823d31acbef4556fb749c457"
-SRC_URI[sha256sum] =
"2642264b27c584eff5747a2a
[yocto] [PATCH][meta-security] bseccomp: fix do package qa warning
From: Changqing Li
Fix below warning:
lib32-libseccomp-2.3.3-r0 do_package: QA Issue: lib32-libseccomp:
Files/directories were installed but not shipped in any package:
Signed-off-by: Changqing Li
---
recipes-security/libseccomp/libseccomp_2.3.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-security/libseccomp/libseccomp_2.3.3.bb
b/recipes-security/libseccomp/libseccomp_2.3.3.bb
index 0a8a679..9c66db6 100644
--- a/recipes-security/libseccomp/libseccomp_2.3.3.bb
+++ b/recipes-security/libseccomp/libseccomp_2.3.3.bb
@@ -35,7 +35,7 @@ do_install_ptest() {
done
}
-FILES_${PN} = "${bindir} ${libdir}/${PN}.so*"
+FILES_${PN} = "${bindir} ${libdir}/${BPN}.so*"
FILES_${PN}-dbg += "${libdir}/${PN}/tests/.debug/*
${libdir}/${PN}/tools/.debug"
RDEPENDS_${PN}-ptest = "bash"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-virtualization] docker: fix package qa warning
From: Changqing Li
fix below warning:
do_package_qa: QA Issue: ELF binary 'xxx/usr/bin/docker'
has relocations in .text [textrel]
Signed-off-by: Changqing Li
---
recipes-containers/docker/docker_git.bb| 1 +
.../files/0001-fix-do_package_qa-error.patch | 31 ++
2 files changed, 32 insertions(+)
create mode 100644
recipes-containers/docker/files/0001-fix-do_package_qa-error.patch
diff --git a/recipes-containers/docker/docker_git.bb
b/recipes-containers/docker/docker_git.bb
index 73e0120..1a8d1a6 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -28,6 +28,7 @@ SRC_URI = "\
file://docker.init \
file://hi.Dockerfile \
file://0001-libnetwork-use-GO-instead-of-go.patch \
+file://0001-fix-do_package_qa-error.patch \
"
# Apache-2.0 for docker
diff --git a/recipes-containers/docker/files/0001-fix-do_package_qa-error.patch
b/recipes-containers/docker/files/0001-fix-do_package_qa-error.patch
new file mode 100644
index 000..79e71a5
--- /dev/null
+++ b/recipes-containers/docker/files/0001-fix-do_package_qa-error.patch
@@ -0,0 +1,31 @@
+From 56c865e2a7269d63f0780b4cd1ed6fdb18e3ff1b Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Wed, 26 Sep 2018 17:41:59 +0800
+Subject: [PATCH] fix do_package_qa error
+
+fix below error:
+do_package_qa: QA Issue: ELF binary 'xxx/usr/bin/docker'
+has relocations in .text [textrel]
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ cli/scripts/build/dynbinary | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cli/scripts/build/dynbinary b/cli/scripts/build/dynbinary
+index 3c32ed3..938e086 100755
+--- a/cli/scripts/build/dynbinary
b/cli/scripts/build/dynbinary
+@@ -9,6 +9,6 @@ source ./scripts/build/.variables
+
+ echo "Building dynamically linked $TARGET"
+ export CGO_ENABLED=1
+-go build -o "${TARGET}" -tags pkcs11 --ldflags "${LDFLAGS}" "${SOURCE}"
++go build -o "${TARGET}" -tags pkcs11 --ldflags "${LDFLAGS}" -buildmode=pie
"${SOURCE}"
+
+ ln -sf "$(basename "${TARGET}")" build/docker
+--
+2.7.4
+
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-virtualization] oci-image-tools: fix do package qa warning
From: Changqing Li
fix below warning:
do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/oci-image-tool'
has relocations in .text [textrel]
Add GOBUILDFLAGS which have -buildmode=pie to fix the problem
Signed-off-by: Changqing Li
---
.../files/0001-fix-do_package_qa-error.patch | 32 ++
.../oci-image-tools/oci-image-tools_git.bb | 4 ++-
2 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644
recipes-containers/oci-image-tools/files/0001-fix-do_package_qa-error.patch
diff --git
a/recipes-containers/oci-image-tools/files/0001-fix-do_package_qa-error.patch
b/recipes-containers/oci-image-tools/files/0001-fix-do_package_qa-error.patch
new file mode 100644
index 000..4b3efc2
--- /dev/null
+++
b/recipes-containers/oci-image-tools/files/0001-fix-do_package_qa-error.patch
@@ -0,0 +1,32 @@
+From 981e2582128911d0b131cb47aeb88005b04b38fe Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 27 Sep 2018 12:54:42 +0800
+Subject: [PATCH] fix do_package_qa error
+
+fix below error:
+do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/oci-image-tool'
+has relocations in .text [textrel]
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ src/import/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/import/Makefile b/src/import/Makefile
+index 61d7a80..7e641e9 100644
+--- a/src/import/Makefile
b/src/import/Makefile
+@@ -29,7 +29,7 @@ check-license:
+
+ .PHONY: tool
+ tool:
+- go build -ldflags "-X main.gitCommit=${COMMIT}" -o oci-image-tool
./cmd/oci-image-tool
++ go build -ldflags "-X main.gitCommit=${COMMIT}" ${GOBUILDFLAGS} -o
oci-image-tool ./cmd/oci-image-tool
+
+
+ all: tool man
+--
+2.7.4
+
diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb
b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
index 807ee26..ad7c5e9 100644
--- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb
+++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
@@ -15,7 +15,9 @@ DEPENDS = "\
SRC_URI = "git://github.com/opencontainers/image-tools.git \
file://0001-image-manifest-Recursively-remove-pre-existing-entri.patch \
file://0002-image-manifest-Split-unpackLayerEntry-into-its-own-f.patch \
- file://0001-config-make-Config.User-mapping-errors-a-warning.patch"
+ file://0001-config-make-Config.User-mapping-errors-a-warning.patch \
+ file://0001-fix-do_package_qa-error.patch \
+"
SRCREV = "4abe1a166f9be97e8e71b1bb4d7599cc29323011"
PV = "0.2.0-dev+git${SRCPV}"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-virtualization] oci-runtime-tools: fix do package qa warning
From: Changqing Li
fix below warning:
do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/oci-runtime-tool'
has relocations in .text [textrel]
Add GOBUILDFLAGS which have -buildmode=pie to fix the problem
Signed-off-by: Changqing Li
---
.../files/0001-fix-do_package_qa-error.patch | 32 ++
.../oci-runtime-tools/oci-runtime-tools_git.bb | 1 +
2 files changed, 33 insertions(+)
create mode 100644
recipes-containers/oci-runtime-tools/files/0001-fix-do_package_qa-error.patch
diff --git
a/recipes-containers/oci-runtime-tools/files/0001-fix-do_package_qa-error.patch
b/recipes-containers/oci-runtime-tools/files/0001-fix-do_package_qa-error.patch
new file mode 100644
index 000..3c5d820
--- /dev/null
+++
b/recipes-containers/oci-runtime-tools/files/0001-fix-do_package_qa-error.patch
@@ -0,0 +1,32 @@
+From 7de9fd7db7a001b66d92d5e80806e50bb5252392 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 27 Sep 2018 12:50:32 +0800
+Subject: [PATCH] fix do_package_qa error
+
+fix below error:
+do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/oci-runtime-tool'
+has relocations in .text [textrel]
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ src/import/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/import/Makefile b/src/import/Makefile
+index 77626d2..b97f6ec 100644
+--- a/src/import/Makefile
b/src/import/Makefile
+@@ -8,7 +8,7 @@ COMMIT=$(shell git rev-parse HEAD 2> /dev/null || true)
+ all: tool runtimetest
+
+ tool:
+- go build -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT}" -o
oci-runtime-tool ./cmd/oci-runtime-tool
++ go build -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT}"
${GOBUILDFLAGS} -o oci-runtime-tool ./cmd/oci-runtime-tool
+
+ .PHONY: runtimetest
+ runtimetest:
+--
+2.7.4
+
diff --git a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
index 61b68b5..218f68c 100644
--- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
+++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM =
"file://src/import/LICENSE;md5=b355a61a394a504dacde901c958f66
SRC_URI = "git://github.com/opencontainers/runtime-tools.git \
file://0001-Revert-implement-add-set-function-for-hooks-items.patch
\
+ file://0001-fix-do_package_qa-error.patch \
"
SRCREV = "6e7da8148f4de2c9e9c9d3b345576898d4f412cb"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-virtualization] docker-distribution: fix do package qa warning
From: Changqing Li
fix below warning:
1.do_package_qa: QA Issue: No GNU_HASH in the elf binary:
xxx/usr/sbin/registry' [ldflags]
2.do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/registry'
has relocations in .text [textrel]
Add GOBUILDFLAGS which have -buildmode=pie to fix the second problem
Signed-off-by: Changqing Li
---
.../docker-distribution/docker-distribution_git.bb | 3 +-
.../files/0001-fix-do_package_qa-error.patch | 32 ++
2 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644
recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch
diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb
b/recipes-containers/docker-distribution/docker-distribution_git.bb
index add5ce1..23d94c9 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
SRCREV_distribution="48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"
SRC_URI =
"git://github.com/docker/distribution.git;branch=release/2.6;name=distribution;destsuffix=git/src/github.com/docker/distribution
\
file://docker-registry.service \
+ file://0001-fix-do_package_qa-error.patch \
"
PACKAGES =+ "docker-registry"
@@ -57,7 +58,7 @@ do_install() {
}
INSANE_SKIP_${PN} += "ldflags already-stripped"
-INSANE_SKIP_docker-registry += "ldflags already-stripped"
+INSANE_SKIP_${MLPREFIX}docker-registry += "ldflags already-stripped"
FILES_docker-registry = "${sbindir}/*"
FILES_docker-registry += "${systemd_unitdir}/system/docker-registry.service"
diff --git
a/recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch
b/recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch
new file mode 100644
index 000..269b0cd
--- /dev/null
+++
b/recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch
@@ -0,0 +1,32 @@
+From 4b9d701fabff8e7969db081406d00fa9fe46b3fd Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 27 Sep 2018 11:05:51 +0800
+Subject: [PATCH] fix do_package_qa error
+
+fix below error:
+do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/registry'
+has relocations in .text [textrel]
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 47b8f1d..13b0f92 100644
+--- a/Makefile
b/Makefile
+@@ -39,7 +39,7 @@ GODEP=$(shell which godep || echo '')
+
+ ${PREFIX}/bin/registry: $(GOFILES)
+ @echo "+ $@"
+- @go build -tags "${DOCKER_BUILDTAGS}" -o $@ ${GO_LDFLAGS}
${GO_GCFLAGS} ./cmd/registry
++ @go build -tags "${DOCKER_BUILDTAGS}" -o $@ ${GO_LDFLAGS}
${GOBUILDFLAGS} ${GO_GCFLAGS} ./cmd/registry
+
+ ${PREFIX}/bin/digest: $(GOFILES)
+ @echo "+ $@"
+--
+2.7.4
+
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-mingw] mingw32-common: only export WINDRES/RC for SDK build
From: Changqing Li
Fix below problem:
MACHINE=intel-x86-64
SDKMACHINE = "i686-mingw32"
bitbake freetype
do_compile failed with below error:
x86_64-wrs-linux-libtool: compile: x86_64-wrs-linux-windres
--include-dir=work/corei7-64-wrs-linux/freetype/2.9.1-r0/recipe-sysroot/usr/include
/work/corei7-64-wrs-linux/freetype/2.9.1-r0/freetype-2.9.1/src/base/ftver.rc
-o work/corei7-64-wrs-linux/freetype/2.9.1-r0/build/.libs/ftver.o
work/corei7-64-wrs-linux/freetype/2.9.1-r0/build//x86_64-wrs-linux-libtool:
line 1752: x86_64-wrs-linux-windres: command not found
we don't want to use windres for target build, only export WINDRES/RC when build
SDK. SDK_OS = "mingw32", so use this override to fix it.
Signed-off-by: Changqing Li
---
conf/machine-sdk/include/mingw32-common.inc | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/conf/machine-sdk/include/mingw32-common.inc
b/conf/machine-sdk/include/mingw32-common.inc
index 07b103a..92bd184 100644
--- a/conf/machine-sdk/include/mingw32-common.inc
+++ b/conf/machine-sdk/include/mingw32-common.inc
@@ -28,8 +28,11 @@ SDKPKGSUFFIX = "nativesdk-mingw32"
MACHINEOVERRIDES .= ":sdkmingw32"
-export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
-export RC = "${WINDRES}"
+WINDRES_mingw32 = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
+RC_mingw32 = "${WINDRES}"
+
+export WINDRES
+export RC
BB_HASHBASE_WHITELIST_append = " WINDRES RC"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] update-rc.d: support enable/disable function
From: Changqing Li
Add support of enable/disable function, so that user can keep
previous config after upgrade package
Signed-off-by: Changqing Li
---
update-rc.d | 70 +
1 file changed, 70 insertions(+)
diff --git a/update-rc.d b/update-rc.d
index e07cf85..1ba97d3 100644
--- a/update-rc.d
+++ b/update-rc.d
@@ -27,6 +27,7 @@ usage()
usage: update-rc.d [-n] [-f] [-r ] remove
update-rc.d [-n] [-r ] [-s] defaults [NN | sNN kNN]
update-rc.d [-n] [-r ] [-s] start|stop NN runlvl
[runlvl] [...] .
+ update-rc.d [-n] [-r ] [-s] enable|disable [S|2|3|4|5]
-n: not really
-f: force
-v: verbose
@@ -101,6 +102,43 @@ makelinks()
done
}
+renamelink()
+{
+ local oldstartstop newstartstop lev oldnn newnn
+ if [ "x$1" = "xS" ]; then
+ oldstartstop="K"
+ newstartstop="S"
+ else
+ oldstartstop="S"
+ newstartstop="K"
+ fi
+
+ lev=$2
+ if ls ${etcd}${lev}.d/${oldstartstop}*${bn} >/dev/null 2>&1; then
+ oldnn=`basename ${etcd}${lev}.d/${oldstartstop}*${bn}|cut -c2-3`
+ newnn=$[100-$oldnn]
+ [ $verbose -eq 1 ] && echo "rename
${etcd}${lev}.d/${oldstartstop}${oldnn}${bn} ->
${etcd}${lev}.d/${newstartstop}${newnn}${bn}"
+ if [ $notreally -eq 0 ];then
+ mv ${etcd}${lev}.d/${oldstartstop}${oldnn}${bn}
${etcd}${lev}.d/${newstartstop}${newnn}${bn}
+ fi
+ if [ $dostart -eq 1 ] && [ $newstartstop = "S" ] && [ $lev =
$RUNLEVEL ]; then
+ $fn start || true
+ fi
+ fi
+
+}
+
+renamelinks()
+{
+ if [ $# -eq 2 ]; then
+ renamelink $1 $2
+ else
+ for i in 2 3 4 5 S; do
+ renamelink $1 $i
+ done
+ fi
+}
+
while [ $# -gt 0 ]; do
case $1 in
-n) notreally=1
@@ -221,6 +259,13 @@ case $1 in
;;
start | stop)
+ if [ $# -lt 4 ]
+ then
+ echo "Not enough arguments"
+ usage
+ exit 1
+ fi
+
while [ $# -gt 0 ]; do
if [ $1 = "start" ]; then
letter=S
@@ -251,6 +296,31 @@ case $1 in
makelinks
;;
+ enable | disable)
+ if [ $1 = "enable" ]; then
+ letter=S
+ elif [ $1 = "disable" ]; then
+ letter=K
+ else
+ usage
+ exit 1
+ fi
+ shift
+ if [ $# -gt 0 ]
+ then
+ case $1 in
+ S|2|3|4|5)
+ renamelinks $letter $1
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+ else
+ renamelinks $letter
+ fi
+ ;;
*)
usage
exit 1
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] ref-variables.xml: update manual page for update-rc.d
From: Changqing Li
Currently, yocto doc refer link http://www.tin.org/bin/man.cgi?
section=8&topic=update-rc.d. as man page of update-rc.d, but lastest
debian udpate-rc.d have big difference with ours, they need insserv
and all the initscripts support LSB comment header.
change to new link which is more similar to ours.
Signed-off-by: Changqing Li
---
documentation/ref-manual/ref-variables.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/documentation/ref-manual/ref-variables.xml
b/documentation/ref-manual/ref-variables.xml
index 595f2db..fc7e087 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -7116,7 +7116,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR =
"${INC_PR}.3"
to the update-rc.d command.
For more information on valid parameters, please see the
update-rc.d manual page at
-.
+.
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [patchwork][PATCH] patchwork: support wsgi
From: Changqing Li provide option of use like nginx + wsgi, this file is backported from patchwork upstream https://github.com/getpatchwork/patchwork Signed-off-by: Changqing Li --- patchwork/wsgi.py | 30 ++ 1 file changed, 30 insertions(+) create mode 100644 patchwork/wsgi.py diff --git a/patchwork/wsgi.py b/patchwork/wsgi.py new file mode 100644 index 000..714ea12 --- /dev/null +++ b/patchwork/wsgi.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Patchwork - automated patch tracking system +# Copyright (C) 2010 Martin F. Krafft +# +# This file is part of the Patchwork package. +# +# Patchwork is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# Patchwork is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Patchwork; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Released under the GNU General Public License v2 or later. + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ['DJANGO_SETTINGS_MODULE'] = 'patchwork.settings.production' + +application = get_wsgi_application() -- 2.7.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [pathchwork][PATCH] patchwork: Add a dockerfile for deploy patchwork and patchtest
From: Changqing Li Add a dockerfile for easy deploy patchwork and patchtest in docker Signed-off-by: Changqing Li --- Dockerfile.pw | 52 +++ README.pw | 32 ++ requirements.txt | 12 ++ scripts/pw_createsuperuser.sh | 5 + scripts/pw_getmail.sh | 8 +++ scripts/pw_migrate.sh | 5 + scripts/pw_runwebserver.sh| 12 ++ 7 files changed, 126 insertions(+) create mode 100644 Dockerfile.pw create mode 100644 README.pw create mode 100644 requirements.txt create mode 100755 scripts/pw_createsuperuser.sh create mode 100755 scripts/pw_getmail.sh create mode 100755 scripts/pw_migrate.sh create mode 100755 scripts/pw_runwebserver.sh diff --git a/Dockerfile.pw b/Dockerfile.pw new file mode 100644 index 000..ae3c1ee --- /dev/null +++ b/Dockerfile.pw @@ -0,0 +1,52 @@ +FROM ubuntu:latest +MAINTAINER owner + +EXPOSE 8080 + +ENV PYTHONUNBUFFERED=1 \ +LANG=en_US.UTF-8 \ +LC_ALL=en_US.UTF-8 \ +LC_CTYPE=en_US.UTF-8 \ +PATH="$PATH:/opt/patchwork/git-pw:/opt/patchtest:/opt/patchtest/scripts" + +RUN apt-get update \ +&& apt-get dist-upgrade -y \ +&& apt-get install -y --no-install-recommends \ +autoconf \ +gcc \ +g++ \ +make \ +locales \ +wget \ +curl \ +cron \ +python-pip \ +python-dev \ +python-setuptools \ +python3-pip \ +python3-dev \ +libmysqlclient-dev \ +git-core \ +getmail4 \ +&& sh -c "echo \"en_US.UTF-8 UTF-8\" >> /etc/locale.gen" \ +&& locale-gen en_US.UTF-8 \ +&& update-locale \ +&& pip2 install wheel \ +&& pip3 install wheel \ +&& pip3 install setuptools \ +&& apt-get autoremove --purge -y \ +&& rm -rf /var/lib/apt/lists/* \ +&& apt-get clean +ADD ./patchwork /opt/patchwork +ADD ./patchtest /opt/patchtest +ADD ./patchtest-oe /opt/patchtest-oe +ADD ./getmailrc /opt/getmail/getmailrc +RUN pip2 install -r /opt/patchwork/requirements.txt \ +&& pip3 install -r /opt/patchtest/requirements.txt \ +&& pip3 install -r /opt/patchtest-oe/requirements.txt \ +&& mkdir -p /opt/getmail \ +&& mkdir -p /opt/pw-logs \ +&& git config --global user.email "patcht...@patchtest.com" \ +&& git config --global user.name "patchtest" \ +&& /opt/patchtest/scripts/create-host-test-folder -t /opt/pw-test \ +&& /opt/patchtest/scripts/create-host-crontab -c /opt/pw-test-cron diff --git a/README.pw b/README.pw new file mode 100644 index 000..ffa7af1 --- /dev/null +++ b/README.pw @@ -0,0 +1,32 @@ +* Dockerfile.pw deploy patchwork, patchtest, patchtest-oe in docker + +* Dockerfile.pw is just an example, you can adjust according to your + deploy condition, like not use getmail, but use postfix. + +* requirements.txt, just for refer, you can also rewrite this + according to patchwork'doc and accoridng to your deploy condition. + +* scripts folder hold the files will be used during deploy with docker. + +* Deploy steps: + +1. Clone patchwork, patchtest, patchtest-oe first, also put getmailrc used by + Dockerfile.pw under the same folder. + +2. Build docker image with Dockerfile.pw +$docker build -t pw -f ./patchwork/Dockerfile.pw . + +3. use mariadb as dataserver: +$ docker pull mariadb +$ docker run -d --name pw-db -e MYSQL_ROOT_PASSWORD=123456 -e MYSQL_DATABASE=pwdb -v /pw/pwdb:/var/lib/mysql mariadb + +5. run web server +docker run -d --name pw-web --link pw-db:pw-db -p 8080:8080 pw "/opt/patchwork/scripts/pw_runwebserver.sh" + +6. config pw +docker exec -it pw-web /opt/patchwork/scripts/pw_migrate.sh +docker exec -it pw-web /opt/patchwork/scripts/pw_createsuperuser.sh + +7. run patchwork +docker run -d --name pw-mail --link pw-db:pw-db pw "/opt/patchwork/scripts/pw_getmail.sh" + diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000..b8f68f2 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,12 @@ +django==1.8.0 +sqlparse==0.2.4 +celery==3.1.20 +django_filter==0.11.0 +djangorestframework==2.4.8 +drf-nested-routers==0.11.1 +psycopg2>=2.7,<2.8 +mysqlclient +jsonfield +enum34 +GitPython +requests diff --git a/scripts/pw_createsuperuser.sh b/scripts/pw_createsuperuser.sh new file mode 100755 index 000..324ce72 --- /dev/null +++ b/scripts/pw_createsuperuser.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +pw_dir='/opt/patchwork' + +(cd $pw_dir; ./manage.py createsuperuser) diff --git a/scripts/pw_getmail.sh b/scripts/pw_getmail.sh new file mode 100755 index 000..eff5c0e --- /dev/null +++ b/scripts/pw_getmail.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +while true +do + getmail --getmaildir=/opt/getmail/ --idle INBOX +sleep 1 +done + diff --git a/scripts/pw_migrate.sh b/scripts/pw_migrate.sh new file mode 100755 index 000..e54b2f4 --- /dev/null +++ b/scripts/pw_migrate.sh @@
[yocto] [patchtest][PATCH] patchtest: several enhancement
From: Changqing Li
* since we need use git-pw in patchwork, and that need GitPython/
requests, so add them into requirements.txt
* fetch-mboxes: add option for supprt select which project to fetch
, not always use default oe-core for pull-events
* test-mboxes: crontab's stdin is not atty, curret way will make
patchtest get patch from stdin, but not the patch
downloaded to folder mboxes. Use pipe stdin way to
suppprt run test-mboxes in crontab
* pw-host-test/create-host-test-folder/create-host-crontab:
These scripts are for run test in docker, detail see
usage.adoc
Signed-off-by: Changqing Li
---
requirements.txt| 2 +
scripts/create-host-crontab | 88
scripts/create-host-test-folder | 151 +
scripts/fetch-mboxes| 9 +-
scripts/pw-host-test| 179
scripts/test-mboxes | 2 +-
usage.adoc | 8 ++
7 files changed, 436 insertions(+), 3 deletions(-)
create mode 100755 scripts/create-host-crontab
create mode 100755 scripts/create-host-test-folder
create mode 100755 scripts/pw-host-test
diff --git a/requirements.txt b/requirements.txt
index 7f7afbf..62a4b5d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,3 @@
jinja2
+GitPython
+requests
diff --git a/scripts/create-host-crontab b/scripts/create-host-crontab
new file mode 100755
index 000..583955f
--- /dev/null
+++ b/scripts/create-host-crontab
@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#
+# create-host-crontab: creates a crontab file used to run patchtest
+#
+# Copyright (C) 2016 Intel Corporation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+CRONDIR=$PWD
+FREQ='*/30 * * * *'
+
+function usage() {
+cat << EOF
+\$ $(basename $0) OPTIONS [SERIES]
+
+where OPTIONS are
+-c: Cron directory to place the crontab. Default:
'$CRONDIR'
+-f : Cron frequency: Default '$FREQ'
+
+EOF
+>&2
+
+exit 1
+}
+
+while getopts ":c:f:h" opt; do
+case $opt in
+ c)
+ CRONDIR=$OPTARG
+ ;;
+ f)
+ FREQ="$OPTARG"
+ ;;
+ \?)
+ echo "Invalid option: -$OPTARG" >&2
+ usage
+ ;;
+ :)
+ echo "Option -$OPTARG requires an argument." >&2
+ usage
+ ;;
+esac
+done
+shift $((OPTIND-1))
+
+# create crondir if necessary
+[ ! -d "$CRONDIR" ] && { mkdir -p $CRONDIR; }
+
+CRONDIR="$(readlink -e $CRONDIR)"
+
+# create crontab
+cat > $CRONDIR/cronenv << EOF
+#!/bin/sh
+#
+# Place any environment variables needed
+# before running 'guest' script
+#
+# include patch* repos into PATH
+PATH="/opt/patchwork/git-pw:/opt/patchtest:/opt/patchtest/scripts:\$PATH"
+
+# Possible settings if cron is run under a proxy
+#unset SSH_AUTH_SOCK
+#export GIT_PROXY_COMMAND=""
+#export ftp_proxy=""
+#export http_proxy=""
+#export https_proxy=""
+#export no_proxy=""
+EOF
+
+chmod +x $CRONDIR/cronenv
+
+cat > "$CRONDIR/crontab" <> $CRONDIR/cronlog 2>&1
+EOF
diff --git a/scripts/create-host-test-folder b/scripts/create-host-test-folder
new file mode 100755
index 000..464ba8a
--- /dev/null
+++ b/scripts/create-host-test-folder
@@ -0,0 +1,151 @@
+#!/usr/bin/env bash
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#
+# create-host-test-folder: Create a test folder on host
+#
+# Copyright (C) 2016 Intel Corporation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+# defaults values
+TESTDIR=''
+PWURL='https://patchwork.openembedded.org'
+PWPRO='oe-core'
[yocto] [PATCH V2] patchwork: Add a dockerfile for deploy patchwork and patchtest
change in v2: run getmail in crontab Changqing Li (1): patchwork: Add a dockerfile for deploy patchwork and patchtest Dockerfile.pw | 52 +++ README.pw | 32 ++ requirements.txt | 12 ++ scripts/pw_createsuperuser.sh | 5 + scripts/pw_getmail.sh | 11 + scripts/pw_migrate.sh | 5 + scripts/pw_runwebserver.sh| 12 ++ 7 files changed, 129 insertions(+) create mode 100644 Dockerfile.pw create mode 100644 README.pw create mode 100644 requirements.txt create mode 100755 scripts/pw_createsuperuser.sh create mode 100755 scripts/pw_getmail.sh create mode 100755 scripts/pw_migrate.sh create mode 100755 scripts/pw_runwebserver.sh -- 2.7.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH V2] patchwork: Add a dockerfile for deploy patchwork and patchtest
From: Changqing Li Add a dockerfile for easy deploy patchwork and patchtest in docker Signed-off-by: Changqing Li --- Dockerfile.pw | 52 +++ README.pw | 32 ++ requirements.txt | 12 ++ scripts/pw_createsuperuser.sh | 5 + scripts/pw_getmail.sh | 11 + scripts/pw_migrate.sh | 5 + scripts/pw_runwebserver.sh| 12 ++ 7 files changed, 129 insertions(+) create mode 100644 Dockerfile.pw create mode 100644 README.pw create mode 100644 requirements.txt create mode 100755 scripts/pw_createsuperuser.sh create mode 100755 scripts/pw_getmail.sh create mode 100755 scripts/pw_migrate.sh create mode 100755 scripts/pw_runwebserver.sh diff --git a/Dockerfile.pw b/Dockerfile.pw new file mode 100644 index 000..ae3c1ee --- /dev/null +++ b/Dockerfile.pw @@ -0,0 +1,52 @@ +FROM ubuntu:latest +MAINTAINER owner + +EXPOSE 8080 + +ENV PYTHONUNBUFFERED=1 \ +LANG=en_US.UTF-8 \ +LC_ALL=en_US.UTF-8 \ +LC_CTYPE=en_US.UTF-8 \ +PATH="$PATH:/opt/patchwork/git-pw:/opt/patchtest:/opt/patchtest/scripts" + +RUN apt-get update \ +&& apt-get dist-upgrade -y \ +&& apt-get install -y --no-install-recommends \ +autoconf \ +gcc \ +g++ \ +make \ +locales \ +wget \ +curl \ +cron \ +python-pip \ +python-dev \ +python-setuptools \ +python3-pip \ +python3-dev \ +libmysqlclient-dev \ +git-core \ +getmail4 \ +&& sh -c "echo \"en_US.UTF-8 UTF-8\" >> /etc/locale.gen" \ +&& locale-gen en_US.UTF-8 \ +&& update-locale \ +&& pip2 install wheel \ +&& pip3 install wheel \ +&& pip3 install setuptools \ +&& apt-get autoremove --purge -y \ +&& rm -rf /var/lib/apt/lists/* \ +&& apt-get clean +ADD ./patchwork /opt/patchwork +ADD ./patchtest /opt/patchtest +ADD ./patchtest-oe /opt/patchtest-oe +ADD ./getmailrc /opt/getmail/getmailrc +RUN pip2 install -r /opt/patchwork/requirements.txt \ +&& pip3 install -r /opt/patchtest/requirements.txt \ +&& pip3 install -r /opt/patchtest-oe/requirements.txt \ +&& mkdir -p /opt/getmail \ +&& mkdir -p /opt/pw-logs \ +&& git config --global user.email "patcht...@patchtest.com" \ +&& git config --global user.name "patchtest" \ +&& /opt/patchtest/scripts/create-host-test-folder -t /opt/pw-test \ +&& /opt/patchtest/scripts/create-host-crontab -c /opt/pw-test-cron diff --git a/README.pw b/README.pw new file mode 100644 index 000..ffa7af1 --- /dev/null +++ b/README.pw @@ -0,0 +1,32 @@ +* Dockerfile.pw deploy patchwork, patchtest, patchtest-oe in docker + +* Dockerfile.pw is just an example, you can adjust according to your + deploy condition, like not use getmail, but use postfix. + +* requirements.txt, just for refer, you can also rewrite this + according to patchwork'doc and accoridng to your deploy condition. + +* scripts folder hold the files will be used during deploy with docker. + +* Deploy steps: + +1. Clone patchwork, patchtest, patchtest-oe first, also put getmailrc used by + Dockerfile.pw under the same folder. + +2. Build docker image with Dockerfile.pw +$docker build -t pw -f ./patchwork/Dockerfile.pw . + +3. use mariadb as dataserver: +$ docker pull mariadb +$ docker run -d --name pw-db -e MYSQL_ROOT_PASSWORD=123456 -e MYSQL_DATABASE=pwdb -v /pw/pwdb:/var/lib/mysql mariadb + +5. run web server +docker run -d --name pw-web --link pw-db:pw-db -p 8080:8080 pw "/opt/patchwork/scripts/pw_runwebserver.sh" + +6. config pw +docker exec -it pw-web /opt/patchwork/scripts/pw_migrate.sh +docker exec -it pw-web /opt/patchwork/scripts/pw_createsuperuser.sh + +7. run patchwork +docker run -d --name pw-mail --link pw-db:pw-db pw "/opt/patchwork/scripts/pw_getmail.sh" + diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000..b8f68f2 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,12 @@ +django==1.8.0 +sqlparse==0.2.4 +celery==3.1.20 +django_filter==0.11.0 +djangorestframework==2.4.8 +drf-nested-routers==0.11.1 +psycopg2>=2.7,<2.8 +mysqlclient +jsonfield +enum34 +GitPython +requests diff --git a/scripts/pw_createsuperuser.sh b/scripts/pw_createsuperuser.sh new file mode 100755 index 000..324ce72 --- /dev/null +++ b/scripts/pw_createsuperuser.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +pw_dir='/opt/patchwork' + +(cd $pw_dir; ./manage.py createsuperuser) diff --git a/scripts/pw_getmail.sh b/scripts/pw_getmail.sh new file mode 100755 index 000..fadf7c9 --- /dev/null +++ b/scripts/pw_getmail.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +sudo /etc/init.d/cron start +echo "*/5 * * * * sudo getmail --getmaildir=/opt/getmail/ --idle INBOX >> /opt/pw-test-cron/getmail.log 2>&1" > /opt/pw-test-cron/cron-getmail +sudo crontab -u wrlbuild /opt/pw-test-cron/cron-getmail + +while
[yocto] [PATCH V2] patchtest: several enhancement for docker
change in V2: fix bug in pw-host-test change in V1: based on previous script guest, which run qemu, and run testcase in qemu, change to pw-host-test, change to run directly on host. and will be used by dockerfile in patchwork, detail deploy can refer change in patchwork for docker deployment. Changqing Li (1): patchtest: several enhancement requirements.txt| 2 + scripts/create-host-crontab | 88 +++ scripts/create-host-test-folder | 151 scripts/fetch-mboxes| 9 +- scripts/pw-host-test| 185 scripts/test-mboxes | 2 +- usage.adoc | 8 ++ 7 files changed, 442 insertions(+), 3 deletions(-) create mode 100755 scripts/create-host-crontab create mode 100755 scripts/create-host-test-folder create mode 100755 scripts/pw-host-test -- 2.7.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH V2] patchtest: several enhancement
From: Changqing Li
* since we need use git-pw in patchwork, and that need GitPython/
requests, so add them into requirements.txt
* fetch-mboxes: add option for supprt select which project to fetch
, not always use default oe-core for pull-events
* test-mboxes: crontab's stdin is not atty, curret way will make
patchtest get patch from stdin, but not the patch
downloaded to folder mboxes. Use pipe stdin way to
suppprt run test-mboxes in crontab
* pw-host-test/create-host-test-folder/create-host-crontab:
These scripts are for run test in docker, detail see
usage.adoc
Signed-off-by: Changqing Li
---
requirements.txt| 2 +
scripts/create-host-crontab | 88 +++
scripts/create-host-test-folder | 151
scripts/fetch-mboxes| 9 +-
scripts/pw-host-test| 185
scripts/test-mboxes | 2 +-
usage.adoc | 8 ++
7 files changed, 442 insertions(+), 3 deletions(-)
create mode 100755 scripts/create-host-crontab
create mode 100755 scripts/create-host-test-folder
create mode 100755 scripts/pw-host-test
diff --git a/requirements.txt b/requirements.txt
index 7f7afbf..62a4b5d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,3 @@
jinja2
+GitPython
+requests
diff --git a/scripts/create-host-crontab b/scripts/create-host-crontab
new file mode 100755
index 000..583955f
--- /dev/null
+++ b/scripts/create-host-crontab
@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#
+# create-host-crontab: creates a crontab file used to run patchtest
+#
+# Copyright (C) 2016 Intel Corporation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+CRONDIR=$PWD
+FREQ='*/30 * * * *'
+
+function usage() {
+cat << EOF
+\$ $(basename $0) OPTIONS [SERIES]
+
+where OPTIONS are
+-c: Cron directory to place the crontab. Default:
'$CRONDIR'
+-f : Cron frequency: Default '$FREQ'
+
+EOF
+>&2
+
+exit 1
+}
+
+while getopts ":c:f:h" opt; do
+case $opt in
+ c)
+ CRONDIR=$OPTARG
+ ;;
+ f)
+ FREQ="$OPTARG"
+ ;;
+ \?)
+ echo "Invalid option: -$OPTARG" >&2
+ usage
+ ;;
+ :)
+ echo "Option -$OPTARG requires an argument." >&2
+ usage
+ ;;
+esac
+done
+shift $((OPTIND-1))
+
+# create crondir if necessary
+[ ! -d "$CRONDIR" ] && { mkdir -p $CRONDIR; }
+
+CRONDIR="$(readlink -e $CRONDIR)"
+
+# create crontab
+cat > $CRONDIR/cronenv << EOF
+#!/bin/sh
+#
+# Place any environment variables needed
+# before running 'guest' script
+#
+# include patch* repos into PATH
+PATH="/opt/patchwork/git-pw:/opt/patchtest:/opt/patchtest/scripts:\$PATH"
+
+# Possible settings if cron is run under a proxy
+#unset SSH_AUTH_SOCK
+#export GIT_PROXY_COMMAND=""
+#export ftp_proxy=""
+#export http_proxy=""
+#export https_proxy=""
+#export no_proxy=""
+EOF
+
+chmod +x $CRONDIR/cronenv
+
+cat > "$CRONDIR/crontab" <> $CRONDIR/cronlog 2>&1
+EOF
diff --git a/scripts/create-host-test-folder b/scripts/create-host-test-folder
new file mode 100755
index 000..464ba8a
--- /dev/null
+++ b/scripts/create-host-test-folder
@@ -0,0 +1,151 @@
+#!/usr/bin/env bash
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#
+# create-host-test-folder: Create a test folder on host
+#
+# Copyright (C) 2016 Intel Corporation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+# defaults values
+TESTDIR=''
+PWURL='https://patchwork.openembedded.org'
+PWPRO='oe-core'
+P
[yocto] [meta-mingw][PATCH] mingw32-common: change mingw sdk to .zip type
From: Changqing Li
Current sdk type is tar.xz, but for mingw sdk, since we
have symlink under the sdk folder, 7zip which used to
extract tar.xz cannot handle it, refer 7zip upstream bug:
https://sourceforge.net/p/sevenzip/discussion/45797/thread/c71d6b96/
so change to .zip type
Also tried to use option --dereference of tar which use means:
"follow symlinks; archive and dump the files they point to"
with this option, when archive it will deal with symlink to hard link,
but windows not support hard link, so drop this solution,
and use .zip for windows.
Signed-off-by: Changqing Li
---
conf/machine-sdk/include/mingw32-common.inc | 5 +
1 file changed, 5 insertions(+)
diff --git a/conf/machine-sdk/include/mingw32-common.inc
b/conf/machine-sdk/include/mingw32-common.inc
index 9011ded..dbad50a 100644
--- a/conf/machine-sdk/include/mingw32-common.inc
+++ b/conf/machine-sdk/include/mingw32-common.inc
@@ -46,3 +46,8 @@ GCCPIE_mingw32 = ""
# wine and wineserver are required to test MinGW SDKs
HOSTTOOLS += "${@'wine wineserver' if (bb.utils.contains_any('IMAGE_CLASSES',
'testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in
["testsdk.bbclass"])) else ''}"
+# mingw sdk use .zip type
+SDK_TAR_TYPE = "zip"
+SDK_TAR_DEPENDS = "zip-native"
+SDK_TAR_CMD ?= "zip -r
${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_TAR_TYPE} ."
+
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-mingw][PATCH V2] testsdk: enhance extract sdk part
From: Changqing Li
Current sdk type is tar.xz, but for mingw sdk, since we
have symlink under the sdk folder, 7zip which used to
extract tar.xz cannot handle it, refer 7zip upstream bug:
https://sourceforge.net/p/sevenzip/discussion/45797/thread/c71d6b96/
so oe-core have add support of change SDK type to .zip, so correct
the extract function.
Signed-off-by: Changqing Li
---
lib/oeqa/sdkmingw/testsdk.py | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/oeqa/sdkmingw/testsdk.py b/lib/oeqa/sdkmingw/testsdk.py
index 85fe3c6..173cfd9 100644
--- a/lib/oeqa/sdkmingw/testsdk.py
+++ b/lib/oeqa/sdkmingw/testsdk.py
@@ -12,7 +12,7 @@ class TestSDKMinGW(TestSDK):
"""
Get the name of the SDK file
"""
-return d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz")
+return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}")
def extract_sdk(self, tcname, sdk_dir, d):
"""
@@ -23,7 +23,14 @@ class TestSDKMinGW(TestSDK):
try:
# TODO: It would be nice to try and extract the SDK in Wine to make
# sure it is well formed
-subprocess.check_output(['tar', '-xf', tcname, '-C', sdk_dir])
+
+# TODO: Extract SDK according to SDK_ARCHIVE_TYPE, need to change
if
+# oe-core support other types.
+if d.getVar("SDK_ARCHIVE_TYPE") == "zip":
+subprocess.check_output(['unzip', '-d', sdk_dir, tcname])
+else:
+subprocess.check_output(['tar', '-xf', tcname, '-C', sdk_dir])
+
except subprocess.CalledProcessError as e:
bb.fatal("Couldn't install the SDK:\n%s" %
e.output.decode("utf-8"))
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-mingw][PATCH V2] testsdk: enhance extract sdk part
change in V2: 1. move zip part to oe-core, and if usr want to use .zip file set SDK_ARCHIVE_TYPE to zip in local.conf 2. correct extract sdk function for qa test Changqing Li (1): testsdk: enhance extract sdk part lib/oeqa/sdkmingw/testsdk.py | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.7.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH V2 1/2] update-rc.d.bbclass: remove preinst and remove -f for postinst
From: Changqing Li
*preinst use "-f remove" to remove any links in the /etc/rcrunlevel.d
but this will make user cannot keep previous init script link
after upgrade
eg: user disable one service before upgrade, after upgrade, service
could be started since during preinst, all link have been deleted, so
postinst may create the link to start service.
remove preinst to keep previous links, so that after upgrade, if any
link existed for the package, postinst will not create new start/stop
links.
(note: patch of support enable/disable function of update-rc.d send
to yocto mail list today)
*remove -f for postinst, previously, recipe keepalived use remove during
postinst, so need this -f, but remove in postinst is not proper, recipe
keepalived have fixed this problem, so remove -f.
[Yocto #12955]
Signed-off-by: Changqing Li
---
meta/classes/update-rc.d.bbclass | 28
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 265c4be..1366fee 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -20,28 +20,14 @@ def use_updatercd(d):
return '[ -n "$D" -o ! -d /run/systemd/system ]'
return 'true'
-updatercd_preinst() {
-if ${@use_updatercd(d)} && [ -z "$D" -a -f "${INIT_D_DIR}/${INITSCRIPT_NAME}"
]; then
- ${INIT_D_DIR}/${INITSCRIPT_NAME} stop || :
-fi
-if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
- if [ -n "$D" ]; then
- OPT="-f -r $D"
- else
- OPT="-f"
- fi
- update-rc.d $OPT ${INITSCRIPT_NAME} remove
-fi
-}
-
PACKAGE_WRITE_DEPS += "update-rc.d-native"
updatercd_postinst() {
if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
if [ -n "$D" ]; then
- OPT="-f -r $D"
+ OPT="-r $D"
else
- OPT="-f -s"
+ OPT="-s"
fi
update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
fi
@@ -79,7 +65,7 @@ python __anonymous() {
PACKAGESPLITFUNCS_prepend = "${@bb.utils.contains('DISTRO_FEATURES',
'sysvinit', 'populate_packages_updatercd ', '', d)}"
PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd "
-populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm
updatercd_preinst updatercd_postinst"
+populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm
updatercd_postinst"
populate_packages_updatercd[vardepsexclude] += "OVERRIDES"
python populate_packages_updatercd () {
@@ -95,7 +81,7 @@ python populate_packages_updatercd () {
d.appendVar('RDEPENDS_' + pkg, ' %sinitd-functions' % (mlprefix))
def update_rcd_package(pkg):
-bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm
for %s' % pkg)
+bb.debug(1, 'adding update-rc.d calls to postinst/prerm/postrm for %s'
% pkg)
localdata = bb.data.createCopy(d)
overrides = localdata.getVar("OVERRIDES")
@@ -103,12 +89,6 @@ python populate_packages_updatercd () {
update_rcd_auto_depend(pkg)
-preinst = d.getVar('pkg_preinst_%s' % pkg)
-if not preinst:
-preinst = '#!/bin/sh\n'
-preinst += localdata.getVar('updatercd_preinst')
-d.setVar('pkg_preinst_%s' % pkg, preinst)
-
postinst = d.getVar('pkg_postinst_%s' % pkg)
if not postinst:
postinst = '#!/bin/sh\n'
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH V2 0/2] update-rc.d: support enable/disable function
These three patches are for support disable/enable function for update-rc.d change in V2: add some comments and fix commit message change in V1: * change of script update-rc.d is for support disable/enable of init script link * update-rc.d.bbclass remove preinst to make disable/enable can work after upgrade * fix the doc manual Changqing Li (2): update-rc.d.bbclass: remove preinst and remove -f for postinst ref-variables.xml: update manual page for update-rc.d documentation/ref-manual/ref-variables.xml | 2 +- meta/classes/update-rc.d.bbclass | 28 2 files changed, 5 insertions(+), 25 deletions(-) -- 2.7.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [update-rc.d][PATCH V2] update-rc.d: support enable/disable function
From: Changqing Li
Add support of enable/disable function, so that user can keep
previous config like disable one service even after upgrade package.
this patch need to work with oe-core patch
[update-rc.d.bbclass: remove preinst and remove -f for postinst]
[Yocto 12955]
Signed-off-by: Changqing Li
---
update-rc.d | 81 +
1 file changed, 81 insertions(+)
diff --git a/update-rc.d b/update-rc.d
index e07cf85..a7fb7bc 100644
--- a/update-rc.d
+++ b/update-rc.d
@@ -27,6 +27,7 @@ usage()
usage: update-rc.d [-n] [-f] [-r ] remove
update-rc.d [-n] [-r ] [-s] defaults [NN | sNN kNN]
update-rc.d [-n] [-r ] [-s] start|stop NN runlvl
[runlvl] [...] .
+ update-rc.d [-n] [-r ] [-s] enable|disable [S|2|3|4|5]
-n: not really
-f: force
-v: verbose
@@ -101,6 +102,53 @@ makelinks()
done
}
+# function to disable/enable init script link of one run level
+# $1 should be K/S, means to disable/enable
+# $2 means which run level to disable/enable
+renamelink()
+{
+ local oldstartstop newstartstop lev oldnn newnn
+ if [ "x$1" = "xS" ]; then
+ oldstartstop="K"
+ newstartstop="S"
+ else
+ oldstartstop="S"
+ newstartstop="K"
+ fi
+
+ lev=$2
+ # modifies existing runlevel links for the script /etc/init.d/name by
renaming start links to stop link
+# or stop link to start link with a sequence number equal to the
difference of 100 minus the original sequence number.
+ if ls ${etcd}${lev}.d/${oldstartstop}*${bn} >/dev/null 2>&1; then
+ oldnn=`basename ${etcd}${lev}.d/${oldstartstop}*${bn}|cut -c2-3`
+ newnn=$[100-$oldnn]
+ [ $verbose -eq 1 ] && echo "rename
${etcd}${lev}.d/${oldstartstop}${oldnn}${bn} ->
${etcd}${lev}.d/${newstartstop}${newnn}${bn}"
+ if [ $notreally -eq 0 ];then
+ mv ${etcd}${lev}.d/${oldstartstop}${oldnn}${bn}
${etcd}${lev}.d/${newstartstop}${newnn}${bn}
+ fi
+ if [ $dostart -eq 1 ] && [ $newstartstop = "S" ] && [ $lev =
$RUNLEVEL ]; then
+ $fn start || true
+ fi
+ fi
+
+}
+
+# function to disable/enable init script link
+# $1 should be K/S, means to disable/enable
+# $2 run level [S|2|3|4|5], optional, If no start runlevel is
+# specified after the disable or enable keywords
+# the script will attempt to modify links in all start runlevels
+renamelinks()
+{
+ if [ $# -eq 2 ]; then
+ renamelink $1 $2
+ else
+ for i in 2 3 4 5 S; do
+ renamelink $1 $i
+ done
+ fi
+}
+
while [ $# -gt 0 ]; do
case $1 in
-n) notreally=1
@@ -221,6 +269,13 @@ case $1 in
;;
start | stop)
+ if [ $# -lt 4 ]
+ then
+ echo "Not enough arguments"
+ usage
+ exit 1
+ fi
+
while [ $# -gt 0 ]; do
if [ $1 = "start" ]; then
letter=S
@@ -251,6 +306,32 @@ case $1 in
makelinks
;;
+ enable | disable)
+ if [ $1 = "enable" ]; then
+ letter=S
+ elif [ $1 = "disable" ]; then
+ letter=K
+ else
+ usage
+ exit 1
+ fi
+ shift
+ #
+ if [ $# -gt 0 ]
+ then
+ case $1 in
+ S|2|3|4|5)
+ renamelinks $letter $1
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+ else
+ renamelinks $letter
+ fi
+ ;;
*)
usage
exit 1
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH V2 2/2] ref-variables.xml: update manual page for update-rc.d
From: Changqing Li
Currently, yocto doc refer link http://www.tin.org/bin/man.cgi?
section=8&topic=update-rc.d. as man page of update-rc.d, but lastest
debian udpate-rc.d have big difference with yocto, they need insserv
and all the initscripts support LSB comment header.
change to new link which is more similar to yocto
[Yocto #12955]
Signed-off-by: Changqing Li
---
documentation/ref-manual/ref-variables.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/documentation/ref-manual/ref-variables.xml
b/documentation/ref-manual/ref-variables.xml
index 9e51b75..dc5fc6d 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -7198,7 +7198,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR =
"${INC_PR}.3"
to the update-rc.d command.
For more information on valid parameters, please see the
update-rc.d manual page at
-.
+.
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-security][PATCH] xmlsec1: add PACKAGECONFIG disable-des
From: Changqing Li
Signed-off-by: Changqing Li
---
recipes-security/xmlsec1/xmlsec1_1.2.27.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-security/xmlsec1/xmlsec1_1.2.27.bb
b/recipes-security/xmlsec1/xmlsec1_1.2.27.bb
index 0cd06c5..76e3976 100644
--- a/recipes-security/xmlsec1/xmlsec1_1.2.27.bb
+++ b/recipes-security/xmlsec1/xmlsec1_1.2.27.bb
@@ -33,6 +33,7 @@ PACKAGECONFIG[gnutls] = ",,gnutls"
PACKAGECONFIG[libgcrypt] = ",,libgcrypt"
PACKAGECONFIG[nss] = "--with-nss=${STAGING_LIBDIR}/../..
--with-nspr=${STAGING_LIBDIR}/../..,,nss nspr"
PACKAGECONFIG[openssl] = ",,openssl"
+PACKAGECONFIG[disable-des] = "--disable-des,,,"
# these can be dynamically loaded with xmlSecCryptoDLLoadLibrary()
FILES_SOLIBSDEV = "${libdir}/libxmlsec1.so"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-security][PATCH V2] xmlsec1: add PACKAGECONFIG disable-des
From: Changqing Li
Signed-off-by: Changqing Li
---
recipes-security/xmlsec1/xmlsec1_1.2.27.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-security/xmlsec1/xmlsec1_1.2.27.bb
b/recipes-security/xmlsec1/xmlsec1_1.2.27.bb
index 0cd06c5..eac8d6b 100644
--- a/recipes-security/xmlsec1/xmlsec1_1.2.27.bb
+++ b/recipes-security/xmlsec1/xmlsec1_1.2.27.bb
@@ -28,11 +28,12 @@ inherit autotools-brokensep ptest pkgconfig
CFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3"
CPPFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3"
-PACKAGECONFIG ??= "gnutls libgcrypt nss openssl"
+PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des"
PACKAGECONFIG[gnutls] = ",,gnutls"
PACKAGECONFIG[libgcrypt] = ",,libgcrypt"
PACKAGECONFIG[nss] = "--with-nss=${STAGING_LIBDIR}/../..
--with-nspr=${STAGING_LIBDIR}/../..,,nss nspr"
PACKAGECONFIG[openssl] = ",,openssl"
+PACKAGECONFIG[des] = ",--disable-des,,"
# these can be dynamically loaded with xmlSecCryptoDLLoadLibrary()
FILES_SOLIBSDEV = "${libdir}/libxmlsec1.so"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [patchtest][PATCH] core-image-patchtest: avoid skip parse recipe
From: Changqing Li
patchtest [1] failed since the recipe is skipparsed since it defines
REQUIRED_DISTRO_FEATURES. patchtest don't really need
DISTRO_FEATURES, so fix the problem by set REQUIRED_DISTRO_FEATURES/
COMPATIBLE_MACHINE/COMPATIBLE_HOST to "" to avoid skip parse
[Yocto #13005]
[1] https://patchwork.openembedded.org/series/9949/
Signed-off-by: Changqing Li
---
meta-patchtest/recipes-core/images/core-image-patchtest.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-patchtest/recipes-core/images/core-image-patchtest.bb
b/meta-patchtest/recipes-core/images/core-image-patchtest.bb
index 47e4041..95279d2 100644
--- a/meta-patchtest/recipes-core/images/core-image-patchtest.bb
+++ b/meta-patchtest/recipes-core/images/core-image-patchtest.bb
@@ -30,6 +30,9 @@ TMPBUILD="\$(mktemp -d)"
BRANCH="\$(get-target-branch \$REPO \$MBOX | awk '{print \$NF}')"
cd \$REPO
source ./oe-init-build-env \$TMPBUILD
+echo "COMPATIBLE_MACHINE_qemuall = \\"\\"" >> \$TMPBUILD/conf/local.conf
+echo "COMPATIBLE_HOST_qemuall = \\"\\"" >> \$TMPBUILD/conf/local.conf
+echo "REQUIRED_DISTRO_FEATURES_qemuall = \\"\\"" >> \$TMPBUILD/conf/local.conf
test-mboxes -r \$REPO -s \$SUITESTART -m \$MBOX -o \$RESULTS -- --base-branch
\$BRANCH
rm -rf \$TMPBUILD
}
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [patchtest-oe][PATCH] test_metadata_src_uri: new unittest detecting added patch files without modifying SRC_URI
From: Changqing Li
Adds new unittest detecting when a patch file is added but no corresponding
change to the SRC_URI is done.
This patch is from , get from commit
49201c19cfe4cadd127b112d2858d5b28db49c20, this commit is reverted by commit
6108d97f83b211f9eb245f339a412debd0ec5db4.
The added test case is ok, reason of series 9949 patchtest failed is:
recipe weston have REQUIRED_DISTRO_FEATURES, so parse recipe skipped,
cause self.modified is none, actually .bb is mofified, so make the testcase
failed.
during patchtest, we don't really need DISTRO_FEATURES, so fix the problem
by set REQUIRED_DISTRO_FEATURES to "" in repo patchtest, meantime, add this
testcase back.
[Yocto #13005]
Signed-off-by: Changqing Li
---
tests/test_metadata_src_uri.py | 25 +
1 file changed, 25 insertions(+)
diff --git a/tests/test_metadata_src_uri.py b/tests/test_metadata_src_uri.py
index a4c5caa..f684ced 100644
--- a/tests/test_metadata_src_uri.py
+++ b/tests/test_metadata_src_uri.py
@@ -85,3 +85,28 @@ class SrcUri(base.Metadata):
'Amend the patch containing the software patch
file removal',
data=[('Patch', f) for f in not_removed])
+def test_src_uri_path_not_updated(self):
+new_patches = set()
+for patch in self.patchset:
+if patch.is_added_file and patch.path.endswith('.patch'):
+new_patches.add(os.path.basename(patch.path))
+
+if not new_patches:
+self.skip('No new patches added, skipping test')
+
+if not self.modified:
+self.fail('New patch path missing in SRC_URI',
+ "Add the patch path to the recipe's SRC_URI",
+ data=[('New patch(es)', '\n'.join(new_patches))])
+
+for pn in self.modified:
+rd = self.tinfoil.parse_recipe(pn)
+
+patchtestdata.PatchTestDataStore['%s-%s-%s' % (self.shortid(),
self.metadata, pn)] = rd.getVar(self.metadata)
+test_src_uri= patchtestdata.PatchTestDataStore['%s-%s-%s' %
(self.shortid(), self.metadata, pn)].split()
+test_files= set([os.path.basename(patch) for patch in
test_src_uri if patch.startswith('file://')])
+
+if not test_files.issuperset(new_patches):
+self.fail('New patch path missing in SRC_URI',
+ "Add the patch path in the recipe's SRC_URI",
+ data=[('New patch(es)', p) for p in
new_patches.difference(test_files)])
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [update-rc.d][PATCH V3] update-rc.d: support enable/disable options
From: Changqing Li
Add support of enable/disable options, refer
https://manpages.debian.org/wheezy/sysv-rc/update-rc.d.8.en.html
With support of these options, the usr can never change an existing
configuration even after upgrading a package. The program will only
install links if none are present, otherwise, it will keep
the previous configuration.
preinst in update-rc.d.bbclass will delete all the links under
rcrunlevel.d, this behavior now conflicts with enable/disable
options. so remove preinst from the update-rc.d.bbclass
[Yocto 12955]
Signed-off-by: Changqing Li
---
update-rc.d | 81 +
1 file changed, 81 insertions(+)
diff --git a/update-rc.d b/update-rc.d
index e07cf85..a7fb7bc 100644
--- a/update-rc.d
+++ b/update-rc.d
@@ -27,6 +27,7 @@ usage()
usage: update-rc.d [-n] [-f] [-r ] remove
update-rc.d [-n] [-r ] [-s] defaults [NN | sNN kNN]
update-rc.d [-n] [-r ] [-s] start|stop NN runlvl
[runlvl] [...] .
+ update-rc.d [-n] [-r ] [-s] enable|disable [S|2|3|4|5]
-n: not really
-f: force
-v: verbose
@@ -101,6 +102,53 @@ makelinks()
done
}
+# function to disable/enable init script link of one run level
+# $1 should be K/S, means to disable/enable
+# $2 means which run level to disable/enable
+renamelink()
+{
+ local oldstartstop newstartstop lev oldnn newnn
+ if [ "x$1" = "xS" ]; then
+ oldstartstop="K"
+ newstartstop="S"
+ else
+ oldstartstop="S"
+ newstartstop="K"
+ fi
+
+ lev=$2
+ # modifies existing runlevel links for the script /etc/init.d/name by
renaming start links to stop link
+# or stop link to start link with a sequence number equal to the
difference of 100 minus the original sequence number.
+ if ls ${etcd}${lev}.d/${oldstartstop}*${bn} >/dev/null 2>&1; then
+ oldnn=`basename ${etcd}${lev}.d/${oldstartstop}*${bn}|cut -c2-3`
+ newnn=$[100-$oldnn]
+ [ $verbose -eq 1 ] && echo "rename
${etcd}${lev}.d/${oldstartstop}${oldnn}${bn} ->
${etcd}${lev}.d/${newstartstop}${newnn}${bn}"
+ if [ $notreally -eq 0 ];then
+ mv ${etcd}${lev}.d/${oldstartstop}${oldnn}${bn}
${etcd}${lev}.d/${newstartstop}${newnn}${bn}
+ fi
+ if [ $dostart -eq 1 ] && [ $newstartstop = "S" ] && [ $lev =
$RUNLEVEL ]; then
+ $fn start || true
+ fi
+ fi
+
+}
+
+# function to disable/enable init script link
+# $1 should be K/S, means to disable/enable
+# $2 run level [S|2|3|4|5], optional, If no start runlevel is
+# specified after the disable or enable keywords
+# the script will attempt to modify links in all start runlevels
+renamelinks()
+{
+ if [ $# -eq 2 ]; then
+ renamelink $1 $2
+ else
+ for i in 2 3 4 5 S; do
+ renamelink $1 $i
+ done
+ fi
+}
+
while [ $# -gt 0 ]; do
case $1 in
-n) notreally=1
@@ -221,6 +269,13 @@ case $1 in
;;
start | stop)
+ if [ $# -lt 4 ]
+ then
+ echo "Not enough arguments"
+ usage
+ exit 1
+ fi
+
while [ $# -gt 0 ]; do
if [ $1 = "start" ]; then
letter=S
@@ -251,6 +306,32 @@ case $1 in
makelinks
;;
+ enable | disable)
+ if [ $1 = "enable" ]; then
+ letter=S
+ elif [ $1 = "disable" ]; then
+ letter=K
+ else
+ usage
+ exit 1
+ fi
+ shift
+ #
+ if [ $# -gt 0 ]
+ then
+ case $1 in
+ S|2|3|4|5)
+ renamelinks $letter $1
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+ else
+ renamelinks $letter
+ fi
+ ;;
*)
usage
exit 1
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH V3] update-rc.d: support enable/disable options
From: Changqing Li
* update-rc.d has added support of enable/disable options, which are
expected to keep the previous configuration even after upgrade the packages.
With support for these options, it will only create start/stop link
when there are none, or it will keep the previous configuration.
Our preinst uses "-f remove" to remove any links under the /etc/rcrunlevel.d
which is conflicting behavior with disable/enable options, so remove it.
For example, if a user disabled one service before upgrade,
then after upgrade the service could be started. This happens because during
preinst,
all links have been deleted, then postinst may create the link to start
service.
With this change, we remove preinst and therefore keep the previous links
so that after upgrade, if a link existed for the package, then the postinst
will not create new start/stop links.
* remove '-f' for postinst. Previously, the keepalived recipe used 'remove'
during postinst, so we needed the -f, but now the keepalived recipe has fixed
this problem, so it's safe to remove '-f'.
[Yocto #12955]
Signed-off-by: Changqing Li
---
documentation/ref-manual/ref-variables.xml | 2 +-
meta/classes/update-rc.d.bbclass | 28
2 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/documentation/ref-manual/ref-variables.xml
b/documentation/ref-manual/ref-variables.xml
index 536bd15..8fc48c3 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -7243,7 +7243,7 @@
to the update-rc.d command.
For more information on valid parameters, please see the
update-rc.d manual page at
-.
+.
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 265c4be..1366fee 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -20,28 +20,14 @@ def use_updatercd(d):
return '[ -n "$D" -o ! -d /run/systemd/system ]'
return 'true'
-updatercd_preinst() {
-if ${@use_updatercd(d)} && [ -z "$D" -a -f "${INIT_D_DIR}/${INITSCRIPT_NAME}"
]; then
- ${INIT_D_DIR}/${INITSCRIPT_NAME} stop || :
-fi
-if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
- if [ -n "$D" ]; then
- OPT="-f -r $D"
- else
- OPT="-f"
- fi
- update-rc.d $OPT ${INITSCRIPT_NAME} remove
-fi
-}
-
PACKAGE_WRITE_DEPS += "update-rc.d-native"
updatercd_postinst() {
if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
if [ -n "$D" ]; then
- OPT="-f -r $D"
+ OPT="-r $D"
else
- OPT="-f -s"
+ OPT="-s"
fi
update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
fi
@@ -79,7 +65,7 @@ python __anonymous() {
PACKAGESPLITFUNCS_prepend = "${@bb.utils.contains('DISTRO_FEATURES',
'sysvinit', 'populate_packages_updatercd ', '', d)}"
PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd "
-populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm
updatercd_preinst updatercd_postinst"
+populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm
updatercd_postinst"
populate_packages_updatercd[vardepsexclude] += "OVERRIDES"
python populate_packages_updatercd () {
@@ -95,7 +81,7 @@ python populate_packages_updatercd () {
d.appendVar('RDEPENDS_' + pkg, ' %sinitd-functions' % (mlprefix))
def update_rcd_package(pkg):
-bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm
for %s' % pkg)
+bb.debug(1, 'adding update-rc.d calls to postinst/prerm/postrm for %s'
% pkg)
localdata = bb.data.createCopy(d)
overrides = localdata.getVar("OVERRIDES")
@@ -103,12 +89,6 @@ python populate_packages_updatercd () {
update_rcd_auto_depend(pkg)
-preinst = d.getVar('pkg_preinst_%s' % pkg)
-if not preinst:
-preinst = '#!/bin/sh\n'
-preinst += localdata.getVar('updatercd_preinst')
-d.setVar('pkg_preinst_%s' % pkg, preinst)
-
postinst = d.getVar('pkg_postinst_%s' % pkg)
if not postinst:
postinst = '#!/bin/sh\n'
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] samhain: add rconflict for client and server mode
From: Changqing Li
Signed-off-by: Changqing Li
---
recipes-ids/samhain/samhain-client_4.3.2.bb | 1 +
recipes-ids/samhain/samhain-server_4.3.2.bb | 1 +
2 files changed, 2 insertions(+)
diff --git a/recipes-ids/samhain/samhain-client_4.3.2.bb
b/recipes-ids/samhain/samhain-client_4.3.2.bb
index 812408e..0f53a8c 100644
--- a/recipes-ids/samhain/samhain-client_4.3.2.bb
+++ b/recipes-ids/samhain/samhain-client_4.3.2.bb
@@ -9,3 +9,4 @@ EXTRA_OECONF += " \
"
RDEPENDS_${PN} = "acl zlib attr bash"
+RCONFLICTS_${PN} = "samhain-standalone"
diff --git a/recipes-ids/samhain/samhain-server_4.3.2.bb
b/recipes-ids/samhain/samhain-server_4.3.2.bb
index 9341d44..d304912 100644
--- a/recipes-ids/samhain/samhain-server_4.3.2.bb
+++ b/recipes-ids/samhain/samhain-server_4.3.2.bb
@@ -18,3 +18,4 @@ do_install_append() {
}
RDEPENDS_${PN} += "gmp bash perl"
+RCONFLICTS_${PN} = "samhain-standalone"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 1/2] patchtest: fix virtio-9p-pci is not a valid device
From: Changqing Li fix error during runqemu: test_mount: 'virtio-9p-pci' is not a valid device model name recipe qemu has been splited into qemu/qemu-native/qemu-sytem-native Signed-off-by: Changqing Li --- meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend | 1 + meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend delete mode 100644 meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend diff --git a/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend b/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend new file mode 100644 index 000..a91ccb7 --- /dev/null +++ b/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_append = " virtfs" diff --git a/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend b/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend deleted file mode 100644 index 3ad9f03..000 --- a/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG_append_pn-qemu-native = " virtfs" -- 2.7.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [patchtest][PATCH 1/2] patchtest: fix virtio-9p-pci is not a valid device
From: Changqing Li fix error during runqemu: test_mount: 'virtio-9p-pci' is not a valid device model name recipe qemu has been splited into qemu/qemu-native/qemu-sytem-native Signed-off-by: Changqing Li --- meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend | 1 + meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend delete mode 100644 meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend diff --git a/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend b/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend new file mode 100644 index 000..a91ccb7 --- /dev/null +++ b/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_append = " virtfs" diff --git a/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend b/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend deleted file mode 100644 index 3ad9f03..000 --- a/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG_append_pn-qemu-native = " virtfs" -- 2.7.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [patchtest][PATCH 2/2] patchtest: fix linux-yocto version
From: Changqing Li
4.9 is not avaiable currently, preferred version changed
to 5.0, also correct the bbappend name
Signed-off-by: Changqing Li
---
.../linux/{linux-yocto_4.%.bbappend => linux-yocto_%.bbappend} | 0
scripts/create-guest-machine | 5 +
2 files changed, 1 insertion(+), 4 deletions(-)
rename meta-patchtest/recipes-kernel/linux/{linux-yocto_4.%.bbappend =>
linux-yocto_%.bbappend} (100%)
diff --git a/meta-patchtest/recipes-kernel/linux/linux-yocto_4.%.bbappend
b/meta-patchtest/recipes-kernel/linux/linux-yocto_%.bbappend
similarity index 100%
rename from meta-patchtest/recipes-kernel/linux/linux-yocto_4.%.bbappend
rename to meta-patchtest/recipes-kernel/linux/linux-yocto_%.bbappend
diff --git a/scripts/create-guest-machine b/scripts/create-guest-machine
index 8dd6a2e..151d5c2 100755
--- a/scripts/create-guest-machine
+++ b/scripts/create-guest-machine
@@ -145,10 +145,7 @@ cat >> $POKY/build/conf/auto.conf << EOF
$PTSMARK
MACHINE = "$MACHINE"
-# The preferred kernel version in poky (4.10%, master) returns an error whilst
-# executing patchtest on guest. Changing the preferred version to 4.9% as it
-# is more suitable and does not present any errors.
-PREFERRED_VERSION_linux-yocto_qemux86-64 = "4.9%"
+PREFERRED_VERSION_linux-yocto_qemux86-64 = "5.0%"
PACKAGE_CLASSES = "package_ipk"
IMAGE_FSTYPES = "ext4"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [patchtest][PATCH V2] patchtest: fix linux-yocto version
From: Changqing Li
4.9 is not avaiable currently, so remove version from bbappend
and remove PREFERRED_VERSION.
Signed-off-by: Changqing Li
---
.../linux/{linux-yocto_4.%.bbappend => linux-yocto_%.bbappend} | 0
scripts/create-guest-machine | 5 -
2 files changed, 5 deletions(-)
rename meta-patchtest/recipes-kernel/linux/{linux-yocto_4.%.bbappend =>
linux-yocto_%.bbappend} (100%)
diff --git a/meta-patchtest/recipes-kernel/linux/linux-yocto_4.%.bbappend
b/meta-patchtest/recipes-kernel/linux/linux-yocto_%.bbappend
similarity index 100%
rename from meta-patchtest/recipes-kernel/linux/linux-yocto_4.%.bbappend
rename to meta-patchtest/recipes-kernel/linux/linux-yocto_%.bbappend
diff --git a/scripts/create-guest-machine b/scripts/create-guest-machine
index 8dd6a2e..8381ef8 100755
--- a/scripts/create-guest-machine
+++ b/scripts/create-guest-machine
@@ -145,11 +145,6 @@ cat >> $POKY/build/conf/auto.conf << EOF
$PTSMARK
MACHINE = "$MACHINE"
-# The preferred kernel version in poky (4.10%, master) returns an error whilst
-# executing patchtest on guest. Changing the preferred version to 4.9% as it
-# is more suitable and does not present any errors.
-PREFERRED_VERSION_linux-yocto_qemux86-64 = "4.9%"
-
PACKAGE_CLASSES = "package_ipk"
IMAGE_FSTYPES = "ext4"
SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/dev/PATH";
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [poky][PATCH] update-rc.d: update refer link
From: Changqing Li old referred link is not aligned with yocto's update-rc.d. update it to align with current one [Yocto #12955] Signed-off-by: Changqing Li --- documentation/ref-manual/ref-variables.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 12876e3..e5d6136 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml @@ -7243,7 +7243,7 @@ to the update-rc.d command. For more information on valid parameters, please see the update-rc.d manual page at -. +. -- 2.7.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [patchtest-oe][PATCH] test_python_pylint.py: correct filepath passed to pylint
From: Changqing Li
we cannot get abspath of the added/modified file from info
which is generated by unidiff, we can only get path like:
"scripts/lib/wic/plugins/source/bootimg-biosplusefi.py"
So pylint will responsed as "scripts/lib/wic/plugins/
source/bootimg-biosplusefi.py does not exist"
For modified file:
both pretest and test result have this error, so patchtest
will take as no new error is introduced, so patchtest result
is PASS
For new added file:
since test result have error "... does not exist", and pretest
is empty, so patchtest will FAIL with error "... does not exist"
Fixed by add abspath like ".../openembedded-core/scripts/lib/wic
/plugins/source/bootimg-biosplusefi.py" for the file
[YOCTO #13428]
Signed-off-by: Changqing Li
---
tests/test_python_pylint.py | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/test_python_pylint.py b/tests/test_python_pylint.py
index df6a5de..b6c8d4d 100644
--- a/tests/test_python_pylint.py
+++ b/tests/test_python_pylint.py
@@ -18,6 +18,7 @@
import base
import patchtestdata
import pylint.epylint as lint
+import os
class PyLint(base.Base):
pythonpatches = []
@@ -45,7 +46,8 @@ class PyLint(base.Base):
def pretest_pylint(self):
for pythonpatch in self.pythonpatches:
if pythonpatch.is_modified_file:
-(pylint_stdout, pylint_stderr) = lint.py_run(command_options =
pythonpatch.path + self.pylint_options, return_std=True)
+filepath =
os.path.join(os.path.abspath(patchtestdata.PatchTestInput.repodir),
pythonpatch.path)
+(pylint_stdout, pylint_stderr) = lint.py_run(command_options =
filepath + self.pylint_options, return_std=True)
for line in pylint_stdout.readlines():
if not '*' in line:
if line.strip():
@@ -59,12 +61,12 @@ class PyLint(base.Base):
path = pythonpatch.target_file[2:]
else:
path = pythonpatch.path
-(pylint_stdout, pylint_stderr) = lint.py_run(command_options =
path + self.pylint_options, return_std=True)
+filepath =
os.path.join(os.path.abspath(patchtestdata.PatchTestInput.repodir), path)
+(pylint_stdout, pylint_stderr) = lint.py_run(command_options =
filepath + self.pylint_options, return_std=True)
for line in pylint_stdout.readlines():
if not '*' in line:
if line.strip():
self.pylint_test[line.strip().split(' ',1)[0]] =
line.strip().split(' ',1)[1]
-
for issue in self.pylint_test:
if self.pylint_test[issue] not in self.pylint_pretest.values():
self.fail('Errors in your Python code were encountered',
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-security][PATCH] keyutils: remove it
From: Changqing Li
keyutils have been moved to meta-openembeded by this commit
https://git.openembedded.org/meta-openembedded/commit/?id=415e213ad75ec9a93171c963395a1c4b92c6233b
so remove this one
Signed-off-by: Changqing Li
---
.../keyutils/files/fix_library_install_path.patch | 28
...ix-error-report-by-adding-default-message.patch | 42 -
.../files/keyutils-test-fix-output-format.patch| 41 -
recipes-security/keyutils/files/run-ptest | 3 --
recipes-security/keyutils/keyutils_1.6.bb | 53 --
5 files changed, 167 deletions(-)
delete mode 100644
recipes-security/keyutils/files/fix_library_install_path.patch
delete mode 100644
recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
delete mode 100644
recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
delete mode 100755 recipes-security/keyutils/files/run-ptest
delete mode 100644 recipes-security/keyutils/keyutils_1.6.bb
diff --git a/recipes-security/keyutils/files/fix_library_install_path.patch
b/recipes-security/keyutils/files/fix_library_install_path.patch
deleted file mode 100644
index 938fe2e..000
--- a/recipes-security/keyutils/files/fix_library_install_path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001
-From: Wenzong Fan
-Date: Tue, 26 Sep 2017 07:59:51 +
-Subject: [PATCH] Subject: [PATCH] keyutils: use relative path for link
-
-The absolute path of the symlink will be invalid
-when populated in sysroot, so use relative path instead.
-
-Upstream-Status: Pending
-
-Signed-off-by: Jackie Huang
-Signed-off-by: Wenzong Fan
-{rebased for 1.6]
-Signed-off-by: Armin Kuster
-
-Index: keyutils-1.6/Makefile
-===
keyutils-1.6.orig/Makefile
-+++ keyutils-1.6/Makefile
-@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0)
- $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
- $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
- mkdir -p $(DESTDIR)$(USRLIBDIR)
-- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
-+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
- sed \
- -e 's,@VERSION\@,$(VERSION),g' \
- -e 's,@prefix\@,$(PREFIX),g' \
diff --git
a/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
b/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
deleted file mode 100644
index acd91c0..000
---
a/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-fix keyutils test error report
-
-Upstream-Status: Pending
-
-"Permission denied" may be the reason of EKEYEXPIRED and EKEYREVOKED.
-"Required key not available" may be the reason of EKEYREVOKED.
-EXPIRED and REVOKED are 2 status of kernel security keys features.
-But the userspace keyutils lib will output the error message, which may
-have several reasons.
-
-Signed-off-by: Han Chao
-
-diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
-index bbca00a..739e9d0 100644
a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -227,11 +227,12 @@ function expect_error ()
- ;;
- EKEYEXPIRED)
- my_err="Key has expired"
-- alt_err="Unknown error 127"
-+ alt_err="Permission denied"
- ;;
- EKEYREVOKED)
- my_err="Key has been revoked"
-- alt_err="Unknown error 128"
-+ alt_err="Permission denied"
-+ alt2_err="Required key not available"
- ;;
- EKEYREJECTED)
- my_err="Key has been rejected"
-@@ -249,6 +250,9 @@ function expect_error ()
- elif [ "x$alt_err" != "x" ] && expr "$my_errmsg" : ".*: $alt_err"
>&/dev/null
- then
- :
-+elif [ "x$alt2_err" != "x" ] && expr "$my_errmsg" : ".*: $alt2_err"
>&/dev/null
-+then
-+ :
- elif [ "x$old_err" != "x" ] && expr "$my_errmsg" : ".*: $old_err"
>&/dev/null
- then
- :
-
diff --git
a/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
b/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
deleted file mode 100644
index a4ffd50..000
--- a/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 49b6321368e4bd3cd233d045cd09004ddd7968b2 Mon Sep 17 00:00:00 2001
-From: Jackie Huang
-Date: Mon, 15 May 2017 14:52:00 +0800
-Subject: [PATCH] keyutils: fix output format
-
-keyutils ptest output format is incorrect, according to yocto
-Development Manual
-(http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#testing-packages-with-ptest)
-5.10.6. Testing Packages With ptestThe test generates output in the format
used by Automake:
-:
-where the result can be PASS, FAIL, or SKIP, and the testname can be any
-identifying string.
[yocto] [meta-security][PATCH] keyutils: remove it
From: Changqing Li
keyutils have been moved to meta-openembeded by this commit
https://git.openembedded.org/meta-openembedded/commit/?id=415e213ad75ec9a93171c963395a1c4b92c6233b
so remove this one
Signed-off-by: Changqing Li
---
.../keyutils/files/fix_library_install_path.patch | 28
...ix-error-report-by-adding-default-message.patch | 42 -
.../files/keyutils-test-fix-output-format.patch| 41 -
recipes-security/keyutils/files/run-ptest | 3 --
recipes-security/keyutils/keyutils_1.6.bb | 53 --
5 files changed, 167 deletions(-)
delete mode 100644
recipes-security/keyutils/files/fix_library_install_path.patch
delete mode 100644
recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
delete mode 100644
recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
delete mode 100755 recipes-security/keyutils/files/run-ptest
delete mode 100644 recipes-security/keyutils/keyutils_1.6.bb
diff --git a/recipes-security/keyutils/files/fix_library_install_path.patch
b/recipes-security/keyutils/files/fix_library_install_path.patch
deleted file mode 100644
index 938fe2e..000
--- a/recipes-security/keyutils/files/fix_library_install_path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001
-From: Wenzong Fan
-Date: Tue, 26 Sep 2017 07:59:51 +
-Subject: [PATCH] Subject: [PATCH] keyutils: use relative path for link
-
-The absolute path of the symlink will be invalid
-when populated in sysroot, so use relative path instead.
-
-Upstream-Status: Pending
-
-Signed-off-by: Jackie Huang
-Signed-off-by: Wenzong Fan
-{rebased for 1.6]
-Signed-off-by: Armin Kuster
-
-Index: keyutils-1.6/Makefile
-===
keyutils-1.6.orig/Makefile
-+++ keyutils-1.6/Makefile
-@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0)
- $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
- $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
- mkdir -p $(DESTDIR)$(USRLIBDIR)
-- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
-+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
- sed \
- -e 's,@VERSION\@,$(VERSION),g' \
- -e 's,@prefix\@,$(PREFIX),g' \
diff --git
a/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
b/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
deleted file mode 100644
index acd91c0..000
---
a/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-fix keyutils test error report
-
-Upstream-Status: Pending
-
-"Permission denied" may be the reason of EKEYEXPIRED and EKEYREVOKED.
-"Required key not available" may be the reason of EKEYREVOKED.
-EXPIRED and REVOKED are 2 status of kernel security keys features.
-But the userspace keyutils lib will output the error message, which may
-have several reasons.
-
-Signed-off-by: Han Chao
-
-diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
-index bbca00a..739e9d0 100644
a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -227,11 +227,12 @@ function expect_error ()
- ;;
- EKEYEXPIRED)
- my_err="Key has expired"
-- alt_err="Unknown error 127"
-+ alt_err="Permission denied"
- ;;
- EKEYREVOKED)
- my_err="Key has been revoked"
-- alt_err="Unknown error 128"
-+ alt_err="Permission denied"
-+ alt2_err="Required key not available"
- ;;
- EKEYREJECTED)
- my_err="Key has been rejected"
-@@ -249,6 +250,9 @@ function expect_error ()
- elif [ "x$alt_err" != "x" ] && expr "$my_errmsg" : ".*: $alt_err"
>&/dev/null
- then
- :
-+elif [ "x$alt2_err" != "x" ] && expr "$my_errmsg" : ".*: $alt2_err"
>&/dev/null
-+then
-+ :
- elif [ "x$old_err" != "x" ] && expr "$my_errmsg" : ".*: $old_err"
>&/dev/null
- then
- :
-
diff --git
a/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
b/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
deleted file mode 100644
index a4ffd50..000
--- a/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 49b6321368e4bd3cd233d045cd09004ddd7968b2 Mon Sep 17 00:00:00 2001
-From: Jackie Huang
-Date: Mon, 15 May 2017 14:52:00 +0800
-Subject: [PATCH] keyutils: fix output format
-
-keyutils ptest output format is incorrect, according to yocto
-Development Manual
-(http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#testing-packages-with-ptest)
-5.10.6. Testing Packages With ptestThe test generates output in the format
used by Automake:
-:
-where the result can be PASS, FAIL, or SKIP, and the testname can be any
-identifying string.
[yocto] [meta-dpdk][PATCH] dpdk: support usrmerge
From: Changqing Li
Signed-off-by: Changqing Li
---
recipes-extended/dpdk/dpdk.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 9dcec76..08db741 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -40,7 +40,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir"
inherit module
-export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
+export
MODULE_DIR="${@bb.utils.contains('DISTRO_FEATURES','usrmerge','/usr','',d)}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
export RTE_SDK = "${S}"
export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-cloud-services][PATCH 1/14] glusterfs: support usrmerge [LINUXEXEC-1807]
From: Changqing Li
Issue: LINUXEXEC-1807
(LOCAL REV: NOT UPSTREAM) -- send upstream 20190830
Signed-off-by: Changqing Li
---
recipes-extended/glusterfs/glusterfs.inc | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/glusterfs/glusterfs.inc
b/recipes-extended/glusterfs/glusterfs.inc
index 40a3922..66e2bf1 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -64,9 +64,11 @@ do_install_append() {
install -m 0755 ${WORKDIR}/glusterd.init \
${D}${sysconfdir}/init.d/glusterd
-# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
-mkdir -p ${D}${base_sbindir}
-(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)};
then
+# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
+mkdir -p ${D}${base_sbindir}
+(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+fi
# These are plug-ins, so they don't need libtool configs.
find ${D}${libdir}/glusterfs/${PV} -name '*.la' -exec rm -f '{}' ';'
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-cloud-services][PATCH] glusterfs: support usrmerge
From: Changqing Li
Signed-off-by: Changqing Li
---
recipes-extended/glusterfs/glusterfs.inc | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/glusterfs/glusterfs.inc
b/recipes-extended/glusterfs/glusterfs.inc
index 40a3922..66e2bf1 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -64,9 +64,11 @@ do_install_append() {
install -m 0755 ${WORKDIR}/glusterd.init \
${D}${sysconfdir}/init.d/glusterd
-# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
-mkdir -p ${D}${base_sbindir}
-(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)};
then
+# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
+mkdir -p ${D}${base_sbindir}
+(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+fi
# These are plug-ins, so they don't need libtool configs.
find ${D}${libdir}/glusterfs/${PV} -name '*.la' -exec rm -f '{}' ';'
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-dpdk][PATCH V2] dpdk: support usrmerge
From: Changqing Li
Signed-off-by: Changqing Li
---
recipes-extended/dpdk/dpdk.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 9dcec76..9b04881 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -40,7 +40,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir"
inherit module
-export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
+export
MODULE_DIR="${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net"
export RTE_SDK = "${S}"
export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-cgl][PATCH] monit: upgrade 5.25.2 -> 5.26.0
From: Changqing Li
Signed-off-by: Changqing Li
---
.../recipes-cgl/monit/{monit_5.25.2.bb => monit_5.26.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-cgl-common/recipes-cgl/monit/{monit_5.25.2.bb => monit_5.26.0.bb}
(90%)
diff --git a/meta-cgl-common/recipes-cgl/monit/monit_5.25.2.bb
b/meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb
similarity index 90%
rename from meta-cgl-common/recipes-cgl/monit/monit_5.25.2.bb
rename to meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb
index ab9e922..6ec1a21 100644
--- a/meta-cgl-common/recipes-cgl/monit/monit_5.25.2.bb
+++ b/meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb
@@ -9,7 +9,7 @@ HOMEPAGE = "http://mmonit.com/monit/";
LICENSE = "AGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
-DEPENDS = "openssl zlib"
+DEPENDS = "openssl zlib virtual/crypt"
SRC_URI = "\
http://mmonit.com/monit/dist/${BP}.tar.gz \
@@ -17,8 +17,8 @@ SRC_URI = "\
file://init \
"
-SRC_URI[md5sum] = "890df599d6c1e9cfbbdd3edbacb7db81"
-SRC_URI[sha256sum] =
"aa0ce6361d1155e43e30a86dcff00b2003d434f221c360981ced830275abc64a"
+SRC_URI[md5sum] = "9f7dc65e902c103e4c5891354994c3df"
+SRC_URI[sha256sum] =
"87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2"
INITSCRIPT_NAME = "monit"
INITSCRIPT_PARAMS = "defaults 99"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-cgl][PATCH] pacemaker: upgrade 1.1.19 -> 1.1.21
From: Changqing Li
License-Update: update e-mail address and URL
Signed-off-by: Changqing Li
---
...o-not-execute-target-program-while-cross-.patch | 25 --
.../{pacemaker_1.1.19.bb => pacemaker_1.1.21.bb} | 6 --
2 files changed, 18 insertions(+), 13 deletions(-)
rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.19.bb =>
pacemaker_1.1.21.bb} (95%)
diff --git
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch
index e749f9a..b600fec 100644
---
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch
+++
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch
@@ -1,41 +1,44 @@
-From e8c4b9d98ef15aa7fb02a68b1d7fe9c008cc8bfd Mon Sep 17 00:00:00 2001
-From: Bian Naimeng
-Date: Mon, 6 Jul 2015 12:20:17 +0900
+From 6d59090df5856d32163f256912ddf1c897590447 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Wed, 21 Aug 2019 13:12:13 +0800
Subject: [PATCH] pacemaker: do not execute target program while cross compile
Signed-off-by: Bian Naimeng
+refresh patch to new version 1.1.21
+Signed-off-by: Changqing Li
---
Makefile.common | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile.common b/Makefile.common
-index d73ad04..8973f91 100644
+index 469417f..9f19a53 100644
--- a/Makefile.common
+++ b/Makefile.common
-@@ -36,6 +36,8 @@ if BUILD_HELP
+@@ -36,18 +36,20 @@ if BUILD_HELP
man8_MANS = $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8)
endif
-+man7_MANS =
+++man7_MANS =
+
%.8: % $(MAN8DEPS)
chmod a+x $(abs_builddir)/$<
- $(PCMK_V) PATH=$(abs_builddir):$$PATH $(abs_builddir)/$< --help
-@@ -43,13 +45,13 @@ endif
$(AM_V_MAN)PATH=$(abs_builddir):$$PATH $(HELP2MAN) --output $@
--no-info --section 8 --name "Part of the Pacemaker cluster resource manager"
$(abs_builddir)/$<
%.xml: %
- $(AM_V_GEN)$(abs_builddir)/$< metadata > $@
-+ @echo "xml for $<: Do not try to execute target program here"
++@echo "xml for $<: Do not try to execute target program here"
%.dbook: %.xml
- $(AM_V_XSL)$(XSLTPROC) --nonet --novalid --stringparam man.name $*
$(DBOOK_OPTS) $(top_srcdir)/xml/ocf-meta2man.xsl $(abs_builddir)/$< >
$(abs_builddir)/$@
-+ @echo "dbook for $<: Do not try to execute target program here"
++@echo "dbook for $<: Do not try to execute target program here"
%.7: %.dbook
- $(AM_V_XSL)$(XSLTPROC) $(MANPAGE_XSLT) $(abs_builddir)/$< $(PCMK_quiet)
-+ @echo "man7 for $<: Do not try to execute target program here"
++@echo "man7 for $<: Do not try to execute target program here"
# Build docbook from asciidoc because XML is a PITA to edit
#
+--
+2.7.4
+
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
similarity index 95%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
index a7c38df..feed53d 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
@@ -9,7 +9,7 @@ check resource health."
HOMEPAGE = "http://www.clusterlabs.org";
LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=19a64afd3a35d044a80579d7aafc30ff"
+LIC_FILES_CHKSUM = "file://COPYING;md5=000212f361a81b100d9d0f0435040663"
DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python-native"
@@ -28,12 +28,14 @@ SRC_URI =
"git://github.com/ClusterLabs/${BPN}.git;branch=1.1 \
SRC_URI_append_libc-musl =
"file://0001-pacemaker-fix-compile-error-of-musl-libc.patch"
-SRCREV = "c3c624ea3d98a74a8a287671a156db126c99a7bb"
+SRCREV = "f14e36fd4336874705b34266c7cddbe12119106c"
inherit autotools-brokensep pkgconfig systemd python-dir useradd
S = "${WORKDIR}/git"
+UPSTREAM_CHECK_GITTAGREGEX = "Pacemaker-(?P\d+(\.\d+)+)"
+
CLEANBROKEN = "1"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-cgl][PATCH] libwww-perl: 6.35 -> 6.36
From: Changqing Li
Signed-off-by: Changqing Li
---
.../recipes-perl/perl/{libwww-perl_6.35.bb => libwww-perl_6.36.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-cgl-common/recipes-perl/perl/{libwww-perl_6.35.bb =>
libwww-perl_6.36.bb} (79%)
diff --git a/meta-cgl-common/recipes-perl/perl/libwww-perl_6.35.bb
b/meta-cgl-common/recipes-perl/perl/libwww-perl_6.36.bb
similarity index 79%
rename from meta-cgl-common/recipes-perl/perl/libwww-perl_6.35.bb
rename to meta-cgl-common/recipes-perl/perl/libwww-perl_6.36.bb
index b986b4e..816f4f8 100644
--- a/meta-cgl-common/recipes-perl/perl/libwww-perl_6.35.bb
+++ b/meta-cgl-common/recipes-perl/perl/libwww-perl_6.36.bb
@@ -16,8 +16,8 @@ BBCLASSEXTEND = "native"
PR = "r2"
SRC_URI =
"https://cpan.metacpan.org/authors/id/E/ET/ETHER/libwww-perl-${PV}.tar.gz;name=libwww-perl-${PV}";
-SRC_URI[libwww-perl-6.35.md5sum] = "19cd0f55f61359c973caa9301ec405bd"
-SRC_URI[libwww-perl-6.35.sha256sum] =
"dda2578d7b32152c4afce834761a61d117de286c705a9f7972c7ac6032ca5953"
+SRC_URI[libwww-perl-6.36.md5sum] = "20062717e4084d2f56d84c7ab4c91ec1"
+SRC_URI[libwww-perl-6.36.sha256sum] =
"75c034ab4b37f4b9506dc644300697505582cf9545bcf2e2079e7263f675290a"
S = "${WORKDIR}/libwww-perl-${PV}"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-cgl][PATCH 2/2] ocfs2-tools: Remove lsb from RDEPENDS
From: Changqing Li
The lsb had been removed from oe-core, and the "systemctl start o2cb/ocfs2"
works well after patched, when systemd (no /etc/init.d/functions, either), so
remove the unneeded line.
Signed-off-by: Robert Yang
Signed-off-by: Changqing Li
---
...sh-Remove-unneeded-lib-lsb-init-functions.patch | 32 ++
.../recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb | 7 ++---
2 files changed, 34 insertions(+), 5 deletions(-)
create mode 100644
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch
diff --git
a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch
new file mode 100644
index 000..5609b4b
--- /dev/null
+++
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch
@@ -0,0 +1,32 @@
+From b7913a62e2d78fa98ae2c475de4cc697519181e2 Mon Sep 17 00:00:00 2001
+From: Robert Yang
+Date: Tue, 10 Sep 2019 19:29:16 -0700
+Subject: [PATCH] o2cb.init.sh: Remove unneeded /lib/lsb/init-functions
+
+The "systemctl start o2cb/ocfs2" works well when systemd (no
+/etc/init.d/functions, either), so remove the unneeded line.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang
+---
+ vendor/common/o2cb.init.sh | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/vendor/common/o2cb.init.sh b/vendor/common/o2cb.init.sh
+index 8b0dbf09..49eb9a4c 100755
+--- a/vendor/common/o2cb.init.sh
b/vendor/common/o2cb.init.sh
+@@ -25,9 +25,6 @@ then
+ start_daemon () {
+ daemon $*
+ }
+-else
+-# Let's try to use the LSB functions
+-. /lib/lsb/init-functions
+ fi
+
+ if [ $? != 0 ]
+--
+2.21.0
+
diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
index a0376ec..d64c868 100644
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
@@ -21,6 +21,7 @@ SRC_URI = "git://github.com/markfasheh/ocfs2-tools \
file://ocfs2.service \
file://0001-Fix-build-with-glibc-2.28.patch \
file://0001-mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch \
+file://0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch \
"
SRCREV = "f1b4d073f08679f97b64b3eb88e586032f92a701"
S = "${WORKDIR}/git"
@@ -32,11 +33,7 @@ DEPENDS = "corosync pacemaker \
e2fsprogs e2fsprogs-native \
"
-# lsbinitscripts are needed to replace /etc/init.d/functions supplied by
initscripts (systemv)
-# They are not the same code!
-#
-RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs
chkconfig glib-2.0 \
-
${@bb.utils.contains('DISTRO_FEATURES','systemd','lsbinitscripts','',d)}"
+RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs
chkconfig glib-2.0"
ASNEEDED_pn-${PN} = ""
PARALLEL_MAKE = ""
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-cgl][PATCH 1/2] core-image-cgl/core-image-cgl-initramfs: remove them
From: Changqing Li
remove core-image-cgl.bb and core-image-cgl-initramfs.bb
* They require core-image-lsb.bb which has been removed by oe-core
* Even before LSB support is dropped by oe-core, core-image-cgl
and core-image-cgl-initramfs cannot build success, failed during
do_rootfs with below error, so I suppose that no one use these
2 recipes, so remove it
Error:
Problem: package logcheck-1.3.20-r0.core2_64 requires rsyslog, but none of the
providers can be installed
- package rsyslog-8.1907.0-r0.core2_64 conflicts with sysklogd provided by
sysklogd-1.5.1-r0.core2_64
- package sysklogd-1.5.1-r0.core2_64 conflicts with rsyslog provided by
rsyslog-8.1907.0-r0.core2_64
- package packagegroup-cgl-applications-1.0-r0.noarch requires logcheck, but
none of the providers can be installed
- package packagegroup-core-full-cmdline-initscripts-1.0-r6.noarch requires
sysklogd, but none of the providers can be installed
- package packagegroup-cgl-1.0-r0.noarch requires
packagegroup-cgl-applications, but none of the providers can be installed
- package packagegroup-core-full-cmdline-1.0-r6.noarch requires
packagegroup-core-full-cmdline-initscripts, but none of the providers can be
installed
Signed-off-by: Changqing Li
---
meta-cgl-common/images/core-image-cgl-initramfs.bb | 19 ---
meta-cgl-common/images/core-image-cgl.bb | 28 --
2 files changed, 47 deletions(-)
delete mode 100644 meta-cgl-common/images/core-image-cgl-initramfs.bb
delete mode 100644 meta-cgl-common/images/core-image-cgl.bb
diff --git a/meta-cgl-common/images/core-image-cgl-initramfs.bb
b/meta-cgl-common/images/core-image-cgl-initramfs.bb
deleted file mode 100644
index 67cb4c1..000
--- a/meta-cgl-common/images/core-image-cgl-initramfs.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require core-image-cgl.bb
-
-# Recipe is based on core-image-minimal.bb
-DESCRIPTION = "Initramfs used to mount multipath device as root file system"
-
-PACKAGE_INSTALL = "initramfs-cgl-boot busybox base-passwd udev"
-
-# Do not pollute the initrd image with rootfs features
-IMAGE_FEATURES = ""
-
-export IMAGE_BASENAME = "core-image-cgl-initramfs"
-IMAGE_LINGUAS = ""
-
-LICENSE = "MIT"
-IMAGE_FSTYPES ??= "cpio.gz.u-boot"
-
-IMAGE_ROOTFS_SIZE = "8192"
-
-BAD_RECOMMENDATIONS += "busybox-syslog"
diff --git a/meta-cgl-common/images/core-image-cgl.bb
b/meta-cgl-common/images/core-image-cgl.bb
deleted file mode 100644
index 86bf7d4..000
--- a/meta-cgl-common/images/core-image-cgl.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-require recipes-extended/images/core-image-lsb.bb
-
-
-VALGRIND ?= ""
-VALGRIND_powerpc ?= "valgrind"
-VALGRIND_e500v2 ?= ""
-VALGRIND_x86 ?= "valgrind"
-VALGRIND_x86_64 ?= "valgrind"
-VALGRIND_armv7a ?= "valgrind"
-
-# Include modules in rootfs
-IMAGE_INSTALL += "\
-packagegroup-core-buildessential \
-packagegroup-core-selinux \
-packagegroup-cgl \
-kexec-tools \
-lttng-tools \
-lttng-modules \
-${VALGRIND} \
-"
-
-IMAGE_FSTYPES += " ext3.gz"
-
-# kexec-tools doesn't work on Mips
-KEXECTOOLS_mips ?= ""
-KEXECTOOLS_mipsel ?= ""
-
-IMAGE_FEATURES += "tools-debug tools-profile"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [error-report-web][PATCH] add local.conf and auto.conf as error details
From: Changqing Li
support to display local.conf and auto.conf on error report web,
this need to work with change in oe-core
Signed-off-by: Changqing Li
---
Post/0006_auto_20190917_0419.py | 24
Post/models.py | 2 ++
Post/parser.py | 2 ++
Post/test.py| 2 ++
templates/error-details.html| 10 ++
test-data/test-payload.json | 4 +++-
6 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 Post/0006_auto_20190917_0419.py
diff --git a/Post/0006_auto_20190917_0419.py b/Post/0006_auto_20190917_0419.py
new file mode 100644
index 000..827944e
--- /dev/null
+++ b/Post/0006_auto_20190917_0419.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+dependencies = [
+('Post', '0005_build_error_type'),
+]
+
+operations = [
+migrations.AddField(
+model_name='build',
+name='AUTO_CONF',
+field=models.TextField(default=b'', max_length=5242880),
+),
+migrations.AddField(
+model_name='build',
+name='LOCAL_CONF',
+field=models.TextField(default=b'', max_length=5242880),
+),
+]
diff --git a/Post/models.py b/Post/models.py
index ddf2fc7..e9fd010 100644
--- a/Post/models.py
+++ b/Post/models.py
@@ -43,6 +43,8 @@ class Build(models.Model):
LINK_BACK = models.TextField(max_length=300, blank=True, null=True)
ERROR_TYPE = models.CharField(max_length=20, choices=ERROR_TYPE_CHOICES,
default=ErrorType.RECIPE)
+LOCAL_CONF = models.TextField(max_length=int(settings.MAX_UPLOAD_SIZE),
default="")
+AUTO_CONF = models.TextField(max_length=int(settings.MAX_UPLOAD_SIZE),
default="")
def save(self, *args, **kwargs):
if self.ERROR_TYPE not in [e_type[0] for e_type in
diff --git a/Post/parser.py b/Post/parser.py
index 9639308..69d43c1 100644
--- a/Post/parser.py
+++ b/Post/parser.py
@@ -53,6 +53,8 @@ class Parser:
b.EMAIL = str(jsondata['email'])
b.LINK_BACK = jsondata.get("link_back", None)
b.ERROR_TYPE = jsondata.get("error_type", ErrorType.RECIPE)
+b.LOCAL_CONF = str(jsondata['local_conf'])
+b.AUTO_CONF = str(jsondata['auto_conf'])
# Extract the branch and commit
g = re.match(r'(.*): (.*)', jsondata['branch_commit'])
diff --git a/Post/test.py b/Post/test.py
index 6dc7878..4fe236c 100755
--- a/Post/test.py
+++ b/Post/test.py
@@ -46,6 +46,8 @@ def compare_db_obj_with_payload(self, bf_object):
self.assertEqual(bf_object.BUILD.NAME == str(payload['username']), True)
self.assertEqual(bf_object.BUILD.EMAIL == str(payload['email']), True)
self.assertEqual(bf_object.BUILD.LINK_BACK == payload.get("link_back",
None), True)
+self.assertEqual(bf_object.BUILD.LOCAL_CONF == payload.get("local_conf",
None), True)
+self.assertEqual(bf_object.BUILD.AUTO_CONF == payload.get("auto_conf",
None), True)
g = re.match(r'(.*): (.*)', payload['branch_commit'])
diff --git a/templates/error-details.html b/templates/error-details.html
index c30160d..16311c5 100644
--- a/templates/error-details.html
+++ b/templates/error-details.html
@@ -81,6 +81,16 @@
{% endwith %}
+{% if detail.BUILD.LOCAL_CONF != "" %}
+Local Conf:
+{{ detail.BUILD.LOCAL_CONF }}
+{% endif %}
+
+{% if detail.BUILD.AUTO_CONF != "" %}
+Auto Conf:
+{{ detail.BUILD.AUTO_CONF }}
+{% endif %}
+
https://bugzilla.yoctoproject.org/enter_bug.cgi?classification=__all";
>Open a bug
diff --git a/test-data/test-payload.json b/test-data/test-payload.json
index 0428a16..fd21053 100644
--- a/test-data/test-payload.json
+++ b/test-data/test-payload.json
@@ -1,4 +1,5 @@
{
+"auto_conf": "",
"branch_commit": "(master-test):
736b49449233c936e3099b314a58e91ad17f9774",
"build_sys": "x86_64-linux",
"component": "base-passwd",
@@ -11,7 +12,8 @@
"package": "base-passwd-3.5.29-r0",
"task": "do_install"
}
-],
+],
+"local_conf": "",
"machine": "qemux86",
"nativelsb": "Ubuntu-14.04",
"target_sys": "i586-poky-linux"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [error-report-web][PATCH V2] Add local.conf and auto.conf into error details
From: Changqing Li
Support to display local.conf and auto.conf on error report web.
Here is commit in oe-core, which add local.conf/auto.conf into error report
https://git.openembedded.org/openembedded-core/commit/?id=7adf9707c04d8ef6bcd8d8bda555687f705e6ee6
This commit is related to YOCTO #13252
Signed-off-by: Changqing Li
---
Post/0006_auto_20190917_0419.py | 24
Post/models.py | 2 ++
Post/parser.py | 2 ++
Post/test.py| 2 ++
templates/error-details.html| 10 ++
test-data/test-payload.json | 4 +++-
6 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 Post/0006_auto_20190917_0419.py
diff --git a/Post/0006_auto_20190917_0419.py b/Post/0006_auto_20190917_0419.py
new file mode 100644
index 000..827944e
--- /dev/null
+++ b/Post/0006_auto_20190917_0419.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+dependencies = [
+('Post', '0005_build_error_type'),
+]
+
+operations = [
+migrations.AddField(
+model_name='build',
+name='AUTO_CONF',
+field=models.TextField(default=b'', max_length=5242880),
+),
+migrations.AddField(
+model_name='build',
+name='LOCAL_CONF',
+field=models.TextField(default=b'', max_length=5242880),
+),
+]
diff --git a/Post/models.py b/Post/models.py
index ddf2fc7..e9fd010 100644
--- a/Post/models.py
+++ b/Post/models.py
@@ -43,6 +43,8 @@ class Build(models.Model):
LINK_BACK = models.TextField(max_length=300, blank=True, null=True)
ERROR_TYPE = models.CharField(max_length=20, choices=ERROR_TYPE_CHOICES,
default=ErrorType.RECIPE)
+LOCAL_CONF = models.TextField(max_length=int(settings.MAX_UPLOAD_SIZE),
default="")
+AUTO_CONF = models.TextField(max_length=int(settings.MAX_UPLOAD_SIZE),
default="")
def save(self, *args, **kwargs):
if self.ERROR_TYPE not in [e_type[0] for e_type in
diff --git a/Post/parser.py b/Post/parser.py
index 9639308..69d43c1 100644
--- a/Post/parser.py
+++ b/Post/parser.py
@@ -53,6 +53,8 @@ class Parser:
b.EMAIL = str(jsondata['email'])
b.LINK_BACK = jsondata.get("link_back", None)
b.ERROR_TYPE = jsondata.get("error_type", ErrorType.RECIPE)
+b.LOCAL_CONF = str(jsondata['local_conf'])
+b.AUTO_CONF = str(jsondata['auto_conf'])
# Extract the branch and commit
g = re.match(r'(.*): (.*)', jsondata['branch_commit'])
diff --git a/Post/test.py b/Post/test.py
index 6dc7878..4fe236c 100755
--- a/Post/test.py
+++ b/Post/test.py
@@ -46,6 +46,8 @@ def compare_db_obj_with_payload(self, bf_object):
self.assertEqual(bf_object.BUILD.NAME == str(payload['username']), True)
self.assertEqual(bf_object.BUILD.EMAIL == str(payload['email']), True)
self.assertEqual(bf_object.BUILD.LINK_BACK == payload.get("link_back",
None), True)
+self.assertEqual(bf_object.BUILD.LOCAL_CONF == payload.get("local_conf",
None), True)
+self.assertEqual(bf_object.BUILD.AUTO_CONF == payload.get("auto_conf",
None), True)
g = re.match(r'(.*): (.*)', payload['branch_commit'])
diff --git a/templates/error-details.html b/templates/error-details.html
index c30160d..c8fce05 100644
--- a/templates/error-details.html
+++ b/templates/error-details.html
@@ -81,6 +81,16 @@
{% endwith %}
+{% if detail.BUILD.LOCAL_CONF != "" %}
+Local Conf:
+{{ detail.BUILD.LOCAL_CONF | safe
}}
+{% endif %}
+
+{% if detail.BUILD.AUTO_CONF != "" %}
+Auto Conf:
+{{ detail.BUILD.AUTO_CONF | safe
}}
+{% endif %}
+
https://bugzilla.yoctoproject.org/enter_bug.cgi?classification=__all";
>Open a bug
diff --git a/test-data/test-payload.json b/test-data/test-payload.json
index 0428a16..fd21053 100644
--- a/test-data/test-payload.json
+++ b/test-data/test-payload.json
@@ -1,4 +1,5 @@
{
+"auto_conf": "",
"branch_commit": "(master-test):
736b49449233c936e3099b314a58e91ad17f9774",
"build_sys": "x86_64-linux",
"component": "base-passwd",
@@ -11,7 +12,8 @@
"package": "base-passwd-3.5.29-r0",
"task": "do_install"
}
-],
+],
+"local_conf": "",
"machine": "qemux86",
"nativelsb": "Ubuntu-14.04",
"target_sys": "i586-poky-linux"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
