[oe] [PATCH] mce-test: add it
Signed-off-by: Dengke Du
---
.../mcelog/mce-test/makefile-remove-ldflags.patch | 23 +
meta-oe/recipes-support/mcelog/mce-test_git.bb | 30 ++
2 files changed, 53 insertions(+)
create mode 100644
meta-oe/recipes-support/mcelog/mce-test/makefile-remove-ldflags.patch
create mode 100644 meta-oe/recipes-support/mcelog/mce-test_git.bb
diff --git
a/meta-oe/recipes-support/mcelog/mce-test/makefile-remove-ldflags.patch
b/meta-oe/recipes-support/mcelog/mce-test/makefile-remove-ldflags.patch
new file mode 100644
index 000..0ffedd2
--- /dev/null
+++ b/meta-oe/recipes-support/mcelog/mce-test/makefile-remove-ldflags.patch
@@ -0,0 +1,23 @@
+Remove the default CFLAGS and LDFLAGS in Makefile. Ensure the extra linker
flags can be passed.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao
+
+diff --git a/cases/stress/hwpoison/Makefile b/cases/stress/hwpoison/Makefile
+index da1cbd8..dec5b14 100644
+--- a/cases/stress/hwpoison/Makefile
b/cases/stress/hwpoison/Makefile
+@@ -1,8 +1,8 @@
+-CFLAGS := -g -Wall
+-LDFLAGS := -g
++#CFLAGS := -g -Wall
++#LDFLAGS := -g
+
+-export CFLAGS
+-export LDFLAGS
++#export CFLAGS
++#export LDFLAGS
+
+ all:
+ mkdir -p bin
diff --git a/meta-oe/recipes-support/mcelog/mce-test_git.bb
b/meta-oe/recipes-support/mcelog/mce-test_git.bb
new file mode 100644
index 000..888c729
--- /dev/null
+++ b/meta-oe/recipes-support/mcelog/mce-test_git.bb
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2012 Wind River Systems, Inc.
+#
+SUMMARY = "MCE test suite"
+
+DESCRIPTION = "The MCE test suite is a collection of tools and test scripts
for \
+testing the Linux RAS related features, including CPU/Memory error \
+containment and recovery, ACPI/APEI support etc."
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+SRC_URI =
"git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git \
+ file://makefile-remove-ldflags.patch \
+ "
+SRCREV = "74bffd8b0aa27051aeaa1983a7b23975ca8d8726"
+PV = "20171030+git${SRCPV}"
+
+RDEPENDS_${PN} = "mcelog mce-inject dialog bash"
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+S ="${WORKDIR}/git"
+
+do_install_append(){
+ install -d ${D}/opt/mce-test
+ cp -rf ${S}/* ${D}/opt/mce-test/
+}
+
+FILES_${PN} += "/opt"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] snappy: add -fPIC flags
On 2018年08月29日 00:45, Khem Raj wrote: On Tue, Aug 28, 2018 at 12:29 AM Dengke Du wrote: Let the libsnappy.a be position independent code, so other packages can use it to make shared PIC library, such as ceph. Signed-off-by: Dengke Du --- meta-oe/recipes-extended/snappy/snappy_1.1.7.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb index 6f1978a..70223be 100644 --- a/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb +++ b/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb @@ -19,3 +19,4 @@ inherit cmake pkgconfig PACKAGECONFIG ??= "" PACKAGECONFIG[lzo] = "-DHAVE_LIBLZO2=1,-DHAVE_LIBLZO2=0,lzo," +TARGET_CFLAGS += "-fPIC" perhaps adding the -fPIC flag to CPPFLAGS is better since adding to it would mean it applies to C and C++ compilers equally Thanks! -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] snappy: add -fPIC flags
Let the libsnappy.a be position independent code, so other packages can use it to make shared PIC library, such as ceph. Signed-off-by: Dengke Du --- meta-oe/recipes-extended/snappy/snappy_1.1.7.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb index 6f1978a..70223be 100644 --- a/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb +++ b/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb @@ -19,3 +19,4 @@ inherit cmake pkgconfig PACKAGECONFIG ??= "" PACKAGECONFIG[lzo] = "-DHAVE_LIBLZO2=1,-DHAVE_LIBLZO2=0,lzo," +TARGET_CFLAGS += "-fPIC" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] kernel-selftest: add ptest support
Group the kernel-selftest testcases in run-ptest. Signed-off-by: Dengke Du --- meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | 4 +++- .../recipes-kernel/kernel-selftest/kernel-selftest/run-ptest | 11 +++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100755 meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index d5ccace..d2923bc 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -4,6 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7 \ " +SRC_URI += "file://run-ptest \ +" # for musl libc SRC_URI_libc-musl += "file://userfaultfd.patch \ @@ -17,7 +19,7 @@ PACKAGECONFIG[vm] = ",,,libgcc bash" do_patch[depends] += "virtual/kernel:do_shared_workdir" -inherit linux-kernel-base kernel-arch +inherit linux-kernel-base kernel-arch ptest do_populate_lic[depends] += "virtual/kernel:do_patch" diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest new file mode 100755 index 000..d40b957 --- /dev/null +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest @@ -0,0 +1,11 @@ +#!/bin/sh +export PATH=$PATH:/usr/kernel-selftest/bpf + +# test_align +test_align | grep "12 pass" &> /dev/null +if [ $? == 0 ]; then +echo "[PASS]: test_align" +else +echo "[FAIL]: test_align" +fi + -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] kernel-selftest: compatible with latest kernel
From: "Hongzhi.Song"
There are some new program added for bpf. So we make corresponding
modifications.
Signed-off-by: Hongzhi.Song
---
meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
index 27d98a3..d5ccace 100644
--- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
+++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
@@ -79,7 +79,7 @@ do_configure() {
:
}
-do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_clang_related"
+do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_unrelated"
python copy_kselftest_source_from_kernel() {
sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split()
src_dir = d.getVar("STAGING_KERNEL_DIR")
@@ -94,8 +94,9 @@ python copy_kselftest_source_from_kernel() {
bb.utils.copyfile(src, dest)
}
-remove_clang_related() {
- sed -i -e '/test_pkt_access/d' -e '/test_pkt_md_access/d'
${S}/tools/testing/selftests/bpf/Makefile
+remove_unrelated() {
+ sed -i -e '/test_pkt_access/d' -e '/test_pkt_md_access/d' -e
'/sockmap_verdict_prog/d' ${S}/tools/testing/selftests/bpf/Makefile
+ sed -i '/llc/d' ${S}/tools/testing/selftests/bpf/Makefile
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-virtualization][PATCH] lxc: add runtime depends for util-linux-getopt
When runing:
lxc-create -t download -n test
The system reports that the getopt command can't find. This is because
the lxc-download template depends on getopt command. So add the runtime
depends on util-linux-getopt for lxc.
Signed-off-by: Dengke Du
---
recipes-containers/lxc/lxc_3.0.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-containers/lxc/lxc_3.0.1.bb
b/recipes-containers/lxc/lxc_3.0.1.bb
index a77dd09..d4bfd92 100644
--- a/recipes-containers/lxc/lxc_3.0.1.bb
+++ b/recipes-containers/lxc/lxc_3.0.1.bb
@@ -25,6 +25,7 @@ RDEPENDS_${PN} = " \
gnutls \
nettle \
util-linux-mountpoint \
+ util-linux-getopt \
"
RDEPENDS_${PN}_append_libc-glibc = " glibc-utils"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-intel][PATCH V2] mce-test: add it
Sorry for my mistake, thanks for reminding.
On 2018年06月08日 15:41, Khem Raj wrote:
Hi Dengke
subject seems to indicate its for meta-intel. if so then its sent to
wrong ml.
On 6/7/18 6:49 PM, Dengke Du wrote:
Signed-off-by: Dengke Du
---
.../mce-test/files/makefile-remove-ldflags.patch | 23 +++
recipes-kernel/mce-test/mce-test_git.bb | 48
++
2 files changed, 71 insertions(+)
create mode 100644
recipes-kernel/mce-test/files/makefile-remove-ldflags.patch
create mode 100644 recipes-kernel/mce-test/mce-test_git.bb
diff --git
a/recipes-kernel/mce-test/files/makefile-remove-ldflags.patch
b/recipes-kernel/mce-test/files/makefile-remove-ldflags.patch
new file mode 100644
index 000..0ffedd2
--- /dev/null
+++ b/recipes-kernel/mce-test/files/makefile-remove-ldflags.patch
@@ -0,0 +1,23 @@
+Remove the default CFLAGS and LDFLAGS in Makefile. Ensure the extra
linker flags can be passed.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao
+
+diff --git a/cases/stress/hwpoison/Makefile
b/cases/stress/hwpoison/Makefile
+index da1cbd8..dec5b14 100644
+--- a/cases/stress/hwpoison/Makefile
b/cases/stress/hwpoison/Makefile
+@@ -1,8 +1,8 @@
+-CFLAGS := -g -Wall
+-LDFLAGS := -g
++#CFLAGS := -g -Wall
++#LDFLAGS := -g
+
+-export CFLAGS
+-export LDFLAGS
++#export CFLAGS
++#export LDFLAGS
+
+ all:
+ mkdir -p bin
diff --git a/recipes-kernel/mce-test/mce-test_git.bb
b/recipes-kernel/mce-test/mce-test_git.bb
new file mode 100644
index 000..dca26a6
--- /dev/null
+++ b/recipes-kernel/mce-test/mce-test_git.bb
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2012 Wind River Systems, Inc.
+#
+SUMMARY = "MCE test suite"
+
+DESCRIPTION = "The MCE test suite is a collection of tools and test
scripts for \
+testing the Linux RAS related features, including CPU/Memory error \
+containment and recovery, ACPI/APEI support etc."
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM =
"file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+PR = "r2"
Drop PR
+
+SRC_URI =
"git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git \
+ file://makefile-remove-ldflags.patch \
+ "
+# Use the commit date of SRCREV in PV.
+#
+SRCREV = "74bffd8b0aa27051aeaa1983a7b23975ca8d8726"
+PE = "1"
We do not need PE its a new recipe.
+PV = "20171030+git${SRCPV}"
+
+RDEPENDS_${PN} = "mcelog mce-inject dialog bash"
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+S ="${WORKDIR}/git"
+
+inherit autotools-brokensep
+
+do_install_append(){
+ install -d ${D}/opt/mce-test
+ cp -rf ${S}/* ${D}/opt/mce-test/
+}
+
+FILES_${PN} += "/opt"
+FILES_${PN}-dbg += "/opt/mce-test/cases/function/hwpoison/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/cases/function/erst-inject/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/cases/function/pfa/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/cases/function/core_recovery/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/cases/stress/hwpoison/bin/.debug"
+FILES_${PN}-dbg +=
"/opt/mce-test/cases/stress/hwpoison/tools/page-poisoning/.debug"
+FILES_${PN}-dbg +=
"/opt/mce-test/cases/stress/hwpoison/tools/fs-metadata/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/bin/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/tools/ltp-pan/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/tools/simple_process/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/tools/page-types/.debug"
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-intel][PATCH V2] mce-test: add it
Signed-off-by: Dengke Du
---
.../mce-test/files/makefile-remove-ldflags.patch | 23 +++
recipes-kernel/mce-test/mce-test_git.bb| 48 ++
2 files changed, 71 insertions(+)
create mode 100644 recipes-kernel/mce-test/files/makefile-remove-ldflags.patch
create mode 100644 recipes-kernel/mce-test/mce-test_git.bb
diff --git a/recipes-kernel/mce-test/files/makefile-remove-ldflags.patch
b/recipes-kernel/mce-test/files/makefile-remove-ldflags.patch
new file mode 100644
index 000..0ffedd2
--- /dev/null
+++ b/recipes-kernel/mce-test/files/makefile-remove-ldflags.patch
@@ -0,0 +1,23 @@
+Remove the default CFLAGS and LDFLAGS in Makefile. Ensure the extra linker
flags can be passed.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao
+
+diff --git a/cases/stress/hwpoison/Makefile b/cases/stress/hwpoison/Makefile
+index da1cbd8..dec5b14 100644
+--- a/cases/stress/hwpoison/Makefile
b/cases/stress/hwpoison/Makefile
+@@ -1,8 +1,8 @@
+-CFLAGS := -g -Wall
+-LDFLAGS := -g
++#CFLAGS := -g -Wall
++#LDFLAGS := -g
+
+-export CFLAGS
+-export LDFLAGS
++#export CFLAGS
++#export LDFLAGS
+
+ all:
+ mkdir -p bin
diff --git a/recipes-kernel/mce-test/mce-test_git.bb
b/recipes-kernel/mce-test/mce-test_git.bb
new file mode 100644
index 000..dca26a6
--- /dev/null
+++ b/recipes-kernel/mce-test/mce-test_git.bb
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2012 Wind River Systems, Inc.
+#
+SUMMARY = "MCE test suite"
+
+DESCRIPTION = "The MCE test suite is a collection of tools and test scripts
for \
+testing the Linux RAS related features, including CPU/Memory error \
+containment and recovery, ACPI/APEI support etc."
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+PR = "r2"
+
+SRC_URI =
"git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git \
+ file://makefile-remove-ldflags.patch \
+ "
+# Use the commit date of SRCREV in PV.
+#
+SRCREV = "74bffd8b0aa27051aeaa1983a7b23975ca8d8726"
+PE = "1"
+PV = "20171030+git${SRCPV}"
+
+RDEPENDS_${PN} = "mcelog mce-inject dialog bash"
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+S ="${WORKDIR}/git"
+
+inherit autotools-brokensep
+
+do_install_append(){
+ install -d ${D}/opt/mce-test
+ cp -rf ${S}/* ${D}/opt/mce-test/
+}
+
+FILES_${PN} += "/opt"
+FILES_${PN}-dbg += "/opt/mce-test/cases/function/hwpoison/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/cases/function/erst-inject/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/cases/function/pfa/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/cases/function/core_recovery/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/cases/stress/hwpoison/bin/.debug"
+FILES_${PN}-dbg +=
"/opt/mce-test/cases/stress/hwpoison/tools/page-poisoning/.debug"
+FILES_${PN}-dbg +=
"/opt/mce-test/cases/stress/hwpoison/tools/fs-metadata/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/bin/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/tools/ltp-pan/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/tools/simple_process/.debug"
+FILES_${PN}-dbg += "/opt/mce-test/tools/page-types/.debug"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] netkit-rsh: correct the file attribute
From: Mingli Yu <mingli...@windriver.com>
Correct the file /etc/pam.d/rsh attribute
Signed-off-by: Mingli Yu <mingli...@windriver.com>
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
index d61636e..3990f7b 100644
--- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
+++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
@@ -70,7 +70,7 @@ do_install () {
install -m 0644 debian/hosts.equiv ${D}/${sysconfdir}
install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexec
install -m 0644 ${WORKDIR}/rlogin.pam ${D}/${sysconfdir}/pam.d/rlogin
-install -m 0664 ${WORKDIR}/rsh.pam ${D}/${sysconfdir}/pam.d/rsh
+install -m 0644 ${WORKDIR}/rsh.pam ${D}/${sysconfdir}/pam.d/rsh
fi
cp ${WORKDIR}/rexec.xinetd.netkit ${D}/${sysconfdir}/xinetd.d/rexec
cp ${WORKDIR}/rlogin.xinetd.netkit ${D}/${sysconfdir}/xinetd.d/rlogin
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH V2 1/2] apache2: use volatiles for sysvinit
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb | 4
meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 | 3 +++
2 files changed, 7 insertions(+)
create mode 100644
meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
index f053e37..c7e7b54 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
@@ -20,6 +20,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
file://init \
file://apache2-volatile.conf \
file://apache2.service \
+ file://volatiles.04_apache2 \
"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83"
@@ -90,6 +91,9 @@ do_install_append() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d/
install -m 0644 ${WORKDIR}/apache2-volatile.conf
${D}${sysconfdir}/tmpfiles.d/
+elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false',
d)}; then
+install -d ${D}${sysconfdir}/default/volatiles
+install -m 0644 ${WORKDIR}/volatiles.04_apache2
${D}${sysconfdir}/default/volatiles/04_apache2
fi
install -d ${D}${systemd_unitdir}/system
diff --git a/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
b/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
new file mode 100644
index 000..922075b
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
@@ -0,0 +1,3 @@
+#
+d root root 0755 /var/run/apache2 none
+d root root 0755 /var/log/apache2 none
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH V2 2/2] apache2: change files layout to debian style
The default layout installs log files and pid files into /var/apache2/logs.
This is odd and also will cause security issues because selinux does not know
how to label the security contexts for the files.
Signed-off-by: Xin Ouyang <xin.ouy...@windriver.com>
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
index c7e7b54..1880867 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
@@ -59,9 +59,13 @@ EXTRA_OECONF = "--enable-ssl \
ac_cv_have_threadsafe_pollset=no"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
-PACKAGECONFIG[selinux] =
"--enable-selinux,--disable-selinux,libselinux,libselinux"
+PACKAGECONFIG[selinux] = "--enable-selinux --enable-layout=Debian
--prefix=${base_prefix}/,--disable-selinux,libselinux,libselinux"
PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap
--disable-authnz-ldap,openldap"
+do_configure_prepend() {
+sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-bin:g'
${S}/config.layout
+}
+
do_install_append() {
install -d ${D}/${sysconfdir}/init.d
cat ${WORKDIR}/init | \
@@ -111,6 +115,7 @@ do_install_append_class-target() {
sed -i -e 's,${STAGING_DIR_HOST},,g' \
-e 's,".*/configure","configure",g'
${D}${datadir}/apache2/build/config.nice
+rm -rf ${D}${localstatedir}/run
}
SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
@@ -184,3 +189,6 @@ FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
RDEPENDS_${PN} += "openssl libgcc"
RDEPENDS_${PN}-scripts += "perl ${PN}"
RDEPENDS_${PN}-dev = "perl"
+
+FILES_${PN} += "${libdir}/cgi-bin"
+FILES_${PN} += "${datadir}/${BPN}/"
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] apache2: add a configure file for sysvinit
On 2017年09月14日 16:07, Peter Kjellerstedt wrote:
-Original Message-
From: openembedded-devel-boun...@lists.openembedded.org
[mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf Of
Dengke Du
Sent: den 14 september 2017 08:52
To: openembedded-devel@lists.openembedded.org
Subject: [oe] [PATCH] apache2: add a configure file for sysvinit
This does a lot more than the subject suggests. Was this intentional?
Sorry, I will explain it in V2.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb | 18
+-
.../recipes-httpd/apache2/files/volatiles.04_apache2 | 3 +++
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 meta-webserver/recipes-
httpd/apache2/files/volatiles.04_apache2
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
index f053e37..333e2dc 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
@@ -20,6 +20,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2
\
file://init \
file://apache2-volatile.conf \
file://apache2.service \
+ file://volatiles.04_apache2 \
"
LIC_FILES_CHKSUM =
"file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83"
@@ -58,9 +59,13 @@ EXTRA_OECONF = "--enable-ssl \
ac_cv_have_threadsafe_pollset=no"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux',
d)}"
-PACKAGECONFIG[selinux] = "--enable-selinux,--disable-
selinux,libselinux,libselinux"
+PACKAGECONFIG[selinux] = "--enable-selinux --enable-layout=Debian --
prefix=${base_prefix}/,--disable-selinux,libselinux,libselinux"
PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--
disable-ldap --disable-authnz-ldap,openldap"
+do_configure_prepend() {
+sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-
bin:g' ${S}/config.layout
+}
+
do_install_append() {
install -d ${D}/${sysconfdir}/init.d
cat ${WORKDIR}/init | \
@@ -90,6 +95,9 @@ do_install_append() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true',
'false', d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d/
install -m 0644 ${WORKDIR}/apache2-volatile.conf
${D}${sysconfdir}/tmpfiles.d/
+elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true',
'false', d)}; then
+install -d ${D}${sysconfdir}/default/volatiles
+install -m 0644 ${WORKDIR}/volatiles.04_apache2
${D}${sysconfdir}/default/volatiles/04_apache2
fi
install -d ${D}${systemd_unitdir}/system
@@ -107,6 +115,7 @@ do_install_append_class-target() {
sed -i -e 's,${STAGING_DIR_HOST},,g' \
-e 's,".*/configure","configure",g'
${D}${datadir}/apache2/build/config.nice
+rm -rf ${D}${localstatedir}/run
}
SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
@@ -180,3 +189,10 @@ FILES_${PN}-dbg +=
"${libdir}/${BPN}/modules/.debug"
RDEPENDS_${PN} += "openssl libgcc"
RDEPENDS_${PN}-scripts += "perl ${PN}"
RDEPENDS_${PN}-dev = "perl"
+
+FILES_${PN} += "${libdir}/cgi-bin"
+
+#Disable parallel make install
+PARALLEL_MAKEINST = ""
+
+FILES_${PN} += "${datadir}/${BPN}/"
diff --git a/meta-webserver/recipes-
httpd/apache2/files/volatiles.04_apache2 b/meta-webserver/recipes-
httpd/apache2/files/volatiles.04_apache2
new file mode 100644
index 000..922075b
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
@@ -0,0 +1,3 @@
+#
+d root root 0755 /var/run/apache2 none
+d root root 0755 /var/log/apache2 none
--
2.8.1
//Peter
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] apache2: add a configure file for sysvinit
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb | 18 +-
.../recipes-httpd/apache2/files/volatiles.04_apache2 | 3 +++
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644
meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
index f053e37..333e2dc 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
@@ -20,6 +20,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
file://init \
file://apache2-volatile.conf \
file://apache2.service \
+ file://volatiles.04_apache2 \
"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83"
@@ -58,9 +59,13 @@ EXTRA_OECONF = "--enable-ssl \
ac_cv_have_threadsafe_pollset=no"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
-PACKAGECONFIG[selinux] =
"--enable-selinux,--disable-selinux,libselinux,libselinux"
+PACKAGECONFIG[selinux] = "--enable-selinux --enable-layout=Debian
--prefix=${base_prefix}/,--disable-selinux,libselinux,libselinux"
PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap
--disable-authnz-ldap,openldap"
+do_configure_prepend() {
+sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-bin:g'
${S}/config.layout
+}
+
do_install_append() {
install -d ${D}/${sysconfdir}/init.d
cat ${WORKDIR}/init | \
@@ -90,6 +95,9 @@ do_install_append() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d/
install -m 0644 ${WORKDIR}/apache2-volatile.conf
${D}${sysconfdir}/tmpfiles.d/
+elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false',
d)}; then
+install -d ${D}${sysconfdir}/default/volatiles
+install -m 0644 ${WORKDIR}/volatiles.04_apache2
${D}${sysconfdir}/default/volatiles/04_apache2
fi
install -d ${D}${systemd_unitdir}/system
@@ -107,6 +115,7 @@ do_install_append_class-target() {
sed -i -e 's,${STAGING_DIR_HOST},,g' \
-e 's,".*/configure","configure",g'
${D}${datadir}/apache2/build/config.nice
+rm -rf ${D}${localstatedir}/run
}
SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
@@ -180,3 +189,10 @@ FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
RDEPENDS_${PN} += "openssl libgcc"
RDEPENDS_${PN}-scripts += "perl ${PN}"
RDEPENDS_${PN}-dev = "perl"
+
+FILES_${PN} += "${libdir}/cgi-bin"
+
+#Disable parallel make install
+PARALLEL_MAKEINST = ""
+
+FILES_${PN} += "${datadir}/${BPN}/"
diff --git a/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
b/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
new file mode 100644
index 000..922075b
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
@@ -0,0 +1,3 @@
+#
+d root root 0755 /var/run/apache2 none
+d root root 0755 /var/log/apache2 none
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] squid: upgrade to 3.5.27
Ping.
On 2017年08月29日 13:19, Dengke Du wrote:
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../0001-Before-use-rpc-rpc.h-check-it-first.patch | 32 +++
...e-noexcept-instead-of-throw-for-C-11-comp.patch | 48 --
.../recipes-daemons/squid/files/gcc7-fixes.patch | 17
.../squid/{squid_3.5.26.bb => squid_3.5.27.bb} | 11 +++--
4 files changed, 39 insertions(+), 69 deletions(-)
create mode 100644
meta-networking/recipes-daemons/squid/files/0001-Before-use-rpc-rpc.h-check-it-first.patch
delete mode 100644
meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
delete mode 100644
meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
rename meta-networking/recipes-daemons/squid/{squid_3.5.26.bb =>
squid_3.5.27.bb} (93%)
diff --git
a/meta-networking/recipes-daemons/squid/files/0001-Before-use-rpc-rpc.h-check-it-first.patch
b/meta-networking/recipes-daemons/squid/files/0001-Before-use-rpc-rpc.h-check-it-first.patch
new file mode 100644
index 000..485b18c
--- /dev/null
+++
b/meta-networking/recipes-daemons/squid/files/0001-Before-use-rpc-rpc.h-check-it-first.patch
@@ -0,0 +1,32 @@
+From b5de7a89f31a17d37beb5d22857bbf829dbfb367 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Mon, 28 Aug 2017 23:17:04 -0400
+Subject: [PATCH] Before use rpc/rpc.h, check it first.
+
+When generate configure using *.m4, the ../NIS/required.m4, we should
+check the rpc/rpc.h first before using it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ helpers/basic_auth/NIS/required.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/helpers/basic_auth/NIS/required.m4
b/helpers/basic_auth/NIS/required.m4
+index fdb1360..ec4fe69 100755
+--- a/helpers/basic_auth/NIS/required.m4
b/helpers/basic_auth/NIS/required.m4
+@@ -6,7 +6,8 @@
+ ##
+
+ BUILD_HELPER="NIS"
+-AC_CHECK_HEADERS([sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h
crypt.h],[],[BUILD_HELPER=""],AC_INCLUDES_DEFAULT([
++AC_CHECK_HEADERS([rpc/rpc.h])
++AC_CHECK_HEADERS([sys/types.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h
crypt.h],[],[BUILD_HELPER=""],AC_INCLUDES_DEFAULT([
+ #if HAVE_RPC_RPC_H
+ #include
+ #endif
+--
+2.8.1
+
diff --git
a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
b/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
deleted file mode 100644
index 48674c3..000
---
a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f9150a0dc092ab2cbd47ee428436b747dce323a9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.k...@gmail.com>
-Date: Sun, 23 Apr 2017 10:28:28 -0700
-Subject: [PATCH] SquidNew: use noexcept instead of throw for C++11 compilers
-
-Fixes errors with gcc7 which is more pedantic about c++11
-conformance regarding deprecated features
-
-include/SquidNew.h:21:51: error: dynamic exception specifications are
deprecated in C++11
-_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc)
- ^
-
-Signed-off-by: Khem Raj <raj.k...@gmail.com>
- include/SquidNew.h | 8
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/SquidNew.h b/include/SquidNew.h
-index 39fcee0..c960347 100644
a/include/SquidNew.h
-+++ b/include/SquidNew.h
-@@ -18,19 +18,19 @@
- */
- #include
-
--_SQUID_EXTERNNEW_ void *operator new(size_t size) throw (std::bad_alloc)
-+_SQUID_EXTERNNEW_ void *operator new(size_t size) noexcept(false)
- {
- return xmalloc(size);
- }
--_SQUID_EXTERNNEW_ void operator delete (void *address) throw()
-+_SQUID_EXTERNNEW_ void operator delete (void *address) noexcept(true)
- {
- xfree(address);
- }
--_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc)
-+_SQUID_EXTERNNEW_ void *operator new[] (size_t size) noexcept(false)
- {
- return xmalloc(size);
- }
--_SQUID_EXTERNNEW_ void operator delete[] (void *address) throw()
-+_SQUID_EXTERNNEW_ void operator delete[] (void *address) noexcept(true)
- {
- xfree(address);
- }
---
-2.12.2
-
diff --git a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
b/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
deleted file mode 100644
index cc1ea78..000
--- a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-../../squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc: In function 'void
squidaio_init()':
../../squid-3.5.26/src/DiskIO/DiskThreads/DiskThreads.h:30:50: error: '*' in boolean
context, suggest '&&' instead [-Werror=int-i
Re: [oe] [PATCH] iscsitarget: fix few arguments for netlink_ack
Thanks, you patch more better.
On 2017年09月01日 21:24, Khem Raj wrote:
On Thu, Aug 31, 2017 at 10:26 PM, Dengke Du <dengke...@windriver.com> wrote:
After kernel version 4.12, the function netlink_ack need four arguments,
so adjust it in iscsitarget.
check https://patchwork.openembedded.org/patch/143411/
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
...itarget-fix-few-arguments-for-netlink_ack.patch | 35 ++
.../iscsitarget/iscsitarget_1.4.20.3+svn502.bb | 4 ++-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644
meta-networking/recipes-extended/iscsitarget/files/0001-iscsitarget-fix-few-arguments-for-netlink_ack.patch
diff --git
a/meta-networking/recipes-extended/iscsitarget/files/0001-iscsitarget-fix-few-arguments-for-netlink_ack.patch
b/meta-networking/recipes-extended/iscsitarget/files/0001-iscsitarget-fix-few-arguments-for-netlink_ack.patch
new file mode 100644
index 000..84e5853
--- /dev/null
+++
b/meta-networking/recipes-extended/iscsitarget/files/0001-iscsitarget-fix-few-arguments-for-netlink_ack.patch
@@ -0,0 +1,35 @@
+From 878b6830cbeb912362ea4cc3497954e72df6f043 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Wed, 30 Aug 2017 06:06:49 -0400
+Subject: [PATCH] iscsitarget: fix few arguments for netlink_ack
+
+After the kernel upgrade to 4.12 in OE, the netlink_ack function
+need four arguments, so add it. we can check the commit:
+
+2d4bc93368f5a0ddb57c8c885cdad9c9b7a10ed5
+
+in kernel.
+
+Upstream-Status: Pending
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ kernel/event.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel/event.c b/kernel/event.c
+index ef4adcb..8ba5978 100644
+--- a/kernel/event.c
b/kernel/event.c
+@@ -29,7 +29,7 @@ static void event_recv_skb(struct sk_buff *skb)
+ ietd_pid = NETLINK_CB(skb).portid;
+ WARN_ON(ietd_pid == 0);
+ if (nlh->nlmsg_flags & NLM_F_ACK)
+- netlink_ack(skb, nlh, 0);
++ netlink_ack(skb, nlh, 0, NULL);
+ skb_pull(skb, rlen);
+ }
+ }
+--
+2.8.1
+
diff --git
a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
index 5c1e38e..dddea10 100644
---
a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
+++
b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
@@ -14,7 +14,9 @@ SRC_URI =
"http://ftp.heanet.ie/mirrors/ubuntu/pool/universe/i/${BPN}/${BPN}_${P
file://access-sk_v6_daddr-iff-IPV6-defined.patch \
file://build_with_updated_bio_struct_of_linux_v4.3_and_above.patch
\
file://build_with_updated_interfaces_of_linux_v4.8_and_above.patch
\
- file://fix-call-trace-of-ahash-API-calling.patch"
+ file://fix-call-trace-of-ahash-API-calling.patch \
+ file://0001-iscsitarget-fix-few-arguments-for-netlink_ack.patch \
+ "
SRC_URI[md5sum] = "ef9bc823bbabd3c772208c00d5f2d089"
SRC_URI[sha256sum] =
"d3196ccb78a43266dce28587bfe30d8ab4db7566d7bce96057dfbb84100babb5"
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] openjpeg: upgrade to 2.2.0
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
...fo_header-reject-bmp-files-with-biBitCoun.patch | 31 ++
.../{openjpeg_2.1.1.bb => openjpeg_2.2.0.bb} | 8 +++---
2 files changed, 36 insertions(+), 3 deletions(-)
create mode 100644
meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch
rename meta-oe/recipes-graphics/openjpeg/{openjpeg_2.1.1.bb =>
openjpeg_2.2.0.bb} (65%)
diff --git
a/meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch
b/meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch
new file mode 100644
index 000..866d9aa
--- /dev/null
+++
b/meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch
@@ -0,0 +1,31 @@
+From 226f07e4b49c2757b181c62e6841000c512054e3 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.roua...@spatialys.com>
+Date: Mon, 14 Aug 2017 17:26:58 +0200
+Subject: [PATCH] bmp_read_info_header(): reject bmp files with biBitCount == 0
+ (#983)
+
+Upstream-Status: Backport
[https://github.com/uclouvain/openjpeg/commit/baf0c1ad4572daa89caa3b12985bdd93530f0dd7]
+CVE: CVE-2017-12982
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ src/bin/jp2/convertbmp.c | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/bin/jp2/convertbmp.c b/src/bin/jp2/convertbmp.c
+index b49e7a0..2715fdf 100644
+--- a/src/bin/jp2/convertbmp.c
b/src/bin/jp2/convertbmp.c
+@@ -392,6 +392,10 @@ static OPJ_BOOL bmp_read_info_header(FILE* IN,
OPJ_BITMAPINFOHEADER* header)
+
+ header->biBitCount = (OPJ_UINT16)getc(IN);
+ header->biBitCount |= (OPJ_UINT16)((OPJ_UINT32)getc(IN) << 8);
++if (header->biBitCount == 0) {
++fprintf(stderr, "Error, invalid biBitCount %d\n", 0);
++return OPJ_FALSE;
++}
+
+ if (header->biSize >= 40U) {
+ header->biCompression = (OPJ_UINT32)getc(IN);
+--
+2.8.1
+
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.1.1.bb
b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
similarity index 65%
rename from meta-oe/recipes-graphics/openjpeg/openjpeg_2.1.1.bb
rename to meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
index fa4f796..4ef1c40 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.1.1.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
@@ -4,9 +4,11 @@ HOMEPAGE = "http://www.openjpeg.org;
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c"
-SRC_URI =
"https://github.com/uclouvain/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz;
-SRC_URI[md5sum] = "0cc4b2aee0a9b6e9e21b7abcd201a3ec"
-SRC_URI[sha256sum] =
"82c27f47fc7219e2ed5537ac69545bf15ed8c6ba8e6e1e529f89f7356506dbaa"
+SRC_URI =
"https://github.com/uclouvain/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz
\
+
file://0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch \
+ "
+SRC_URI[md5sum] = "269bb0b175476f3addcc0d03bd9a97b6"
+SRC_URI[sha256sum] =
"6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b"
inherit cmake
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] openjpeg: upgrade to 2.2.0
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../openjpeg/{openjpeg_2.1.1.bb => openjpeg_2.2.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-graphics/openjpeg/{openjpeg_2.1.1.bb =>
openjpeg_2.2.0.bb} (79%)
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.1.1.bb
b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
similarity index 79%
rename from meta-oe/recipes-graphics/openjpeg/openjpeg_2.1.1.bb
rename to meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
index fa4f796..129aba7 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.1.1.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
@@ -5,8 +5,8 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c"
SRC_URI =
"https://github.com/uclouvain/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz;
-SRC_URI[md5sum] = "0cc4b2aee0a9b6e9e21b7abcd201a3ec"
-SRC_URI[sha256sum] =
"82c27f47fc7219e2ed5537ac69545bf15ed8c6ba8e6e1e529f89f7356506dbaa"
+SRC_URI[md5sum] = "269bb0b175476f3addcc0d03bd9a97b6"
+SRC_URI[sha256sum] =
"6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b"
inherit cmake
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] iscsitarget: fix few arguments for netlink_ack
After kernel version 4.12, the function netlink_ack need four arguments,
so adjust it in iscsitarget.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
...itarget-fix-few-arguments-for-netlink_ack.patch | 35 ++
.../iscsitarget/iscsitarget_1.4.20.3+svn502.bb | 4 ++-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644
meta-networking/recipes-extended/iscsitarget/files/0001-iscsitarget-fix-few-arguments-for-netlink_ack.patch
diff --git
a/meta-networking/recipes-extended/iscsitarget/files/0001-iscsitarget-fix-few-arguments-for-netlink_ack.patch
b/meta-networking/recipes-extended/iscsitarget/files/0001-iscsitarget-fix-few-arguments-for-netlink_ack.patch
new file mode 100644
index 000..84e5853
--- /dev/null
+++
b/meta-networking/recipes-extended/iscsitarget/files/0001-iscsitarget-fix-few-arguments-for-netlink_ack.patch
@@ -0,0 +1,35 @@
+From 878b6830cbeb912362ea4cc3497954e72df6f043 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Wed, 30 Aug 2017 06:06:49 -0400
+Subject: [PATCH] iscsitarget: fix few arguments for netlink_ack
+
+After the kernel upgrade to 4.12 in OE, the netlink_ack function
+need four arguments, so add it. we can check the commit:
+
+2d4bc93368f5a0ddb57c8c885cdad9c9b7a10ed5
+
+in kernel.
+
+Upstream-Status: Pending
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ kernel/event.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel/event.c b/kernel/event.c
+index ef4adcb..8ba5978 100644
+--- a/kernel/event.c
b/kernel/event.c
+@@ -29,7 +29,7 @@ static void event_recv_skb(struct sk_buff *skb)
+ ietd_pid = NETLINK_CB(skb).portid;
+ WARN_ON(ietd_pid == 0);
+ if (nlh->nlmsg_flags & NLM_F_ACK)
+- netlink_ack(skb, nlh, 0);
++ netlink_ack(skb, nlh, 0, NULL);
+ skb_pull(skb, rlen);
+ }
+ }
+--
+2.8.1
+
diff --git
a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
index 5c1e38e..dddea10 100644
---
a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
+++
b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
@@ -14,7 +14,9 @@ SRC_URI =
"http://ftp.heanet.ie/mirrors/ubuntu/pool/universe/i/${BPN}/${BPN}_${P
file://access-sk_v6_daddr-iff-IPV6-defined.patch \
file://build_with_updated_bio_struct_of_linux_v4.3_and_above.patch \
file://build_with_updated_interfaces_of_linux_v4.8_and_above.patch \
- file://fix-call-trace-of-ahash-API-calling.patch"
+ file://fix-call-trace-of-ahash-API-calling.patch \
+ file://0001-iscsitarget-fix-few-arguments-for-netlink_ack.patch \
+ "
SRC_URI[md5sum] = "ef9bc823bbabd3c772208c00d5f2d089"
SRC_URI[sha256sum] =
"d3196ccb78a43266dce28587bfe30d8ab4db7566d7bce96057dfbb84100babb5"
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] wolfssl: upgrade to 3.12.0
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
...0001-fix-no-rule-to-make-cyassl-options.h.patch | 27 ++
.../{wolfssl_3.9.0.bb => wolfssl_3.12.0.bb}| 10 +---
2 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644
meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
rename meta-networking/recipes-connectivity/wolfssl/{wolfssl_3.9.0.bb =>
wolfssl_3.12.0.bb} (69%)
diff --git
a/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
b/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
new file mode 100644
index 000..f304d93
--- /dev/null
+++
b/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
@@ -0,0 +1,27 @@
+From fb490136cf8f2456cfe13b0b4f796e6c155e75dc Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Wed, 30 Aug 2017 03:02:32 -0400
+Subject: [PATCH] fix no rule to make cyassl/options.h
+
+Upstream-Status: Pending
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 395d75d..d4a3880 100644
+--- a/configure.ac
b/configure.ac
+@@ -3684,6 +3684,7 @@ AC_CONFIG_FILES([wolfssl/options.h])
+ #fi
+ AC_CONFIG_FILES([support/wolfssl.pc])
+ AC_CONFIG_FILES([rpm/spec])
++AC_CONFIG_FILES([cyassl/options.h])
+
+ AX_CREATE_GENERIC_CONFIG
+ AX_AM_JOBSERVER([yes])
+--
+2.8.1
+
diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb
b/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb
similarity index 69%
rename from meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb
rename to meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb
index afae3c8..5126190 100644
--- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb
+++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb
@@ -12,10 +12,14 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
PROVIDES += "cyassl"
RPROVIDES_${PN} = "cyassl"
-SRC_URI = "http://www.wolfssl.com/${BP}.zip;
+SRC_URI = "https://github.com/wolfSSL/wolfssl/archive/v${PV}-stable.zip \
+ file://0001-fix-no-rule-to-make-cyassl-options.h.patch \
+ "
-SRC_URI[md5sum] = "f3396726a9befd61443c2cce216e39ba"
-SRC_URI[sha256sum] =
"98f50244f7b43f8683bd0cf5c599849d330e75e6cf077e96f14e83bda8b03ca3"
+SRC_URI[md5sum] = "f9caf558169ab650dc8200708799ebeb"
+SRC_URI[sha256sum] =
"b6d87d3e2c8757177d69aff373c91cf162f4a3944fae90fa10d086fd5f9542e7"
+
+S = "${WORKDIR}/wolfssl-${PV}-stable"
inherit autotools
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] wolfssl: upgrade to 3.12.0
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
...0001-fix-no-rule-to-make-cyassl-options.h.patch | 27 ++
.../{wolfssl_3.9.0.bb => wolfssl_3.12.0.bb}| 10 +---
2 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644
meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
rename meta-networking/recipes-connectivity/wolfssl/{wolfssl_3.9.0.bb =>
wolfssl_3.12.0.bb} (69%)
diff --git
a/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
b/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
new file mode 100644
index 000..f304d93
--- /dev/null
+++
b/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
@@ -0,0 +1,27 @@
+From fb490136cf8f2456cfe13b0b4f796e6c155e75dc Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Wed, 30 Aug 2017 03:02:32 -0400
+Subject: [PATCH] fix no rule to make cyassl/options.h
+
+Upstream-Status: Pending
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 395d75d..d4a3880 100644
+--- a/configure.ac
b/configure.ac
+@@ -3684,6 +3684,7 @@ AC_CONFIG_FILES([wolfssl/options.h])
+ #fi
+ AC_CONFIG_FILES([support/wolfssl.pc])
+ AC_CONFIG_FILES([rpm/spec])
++AC_CONFIG_FILES([cyassl/options.h])
+
+ AX_CREATE_GENERIC_CONFIG
+ AX_AM_JOBSERVER([yes])
+--
+2.8.1
+
diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb
b/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb
similarity index 69%
rename from meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb
rename to meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb
index afae3c8..5126190 100644
--- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb
+++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb
@@ -12,10 +12,14 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
PROVIDES += "cyassl"
RPROVIDES_${PN} = "cyassl"
-SRC_URI = "http://www.wolfssl.com/${BP}.zip;
+SRC_URI = "https://github.com/wolfSSL/wolfssl/archive/v${PV}-stable.zip \
+ file://0001-fix-no-rule-to-make-cyassl-options.h.patch \
+ "
-SRC_URI[md5sum] = "f3396726a9befd61443c2cce216e39ba"
-SRC_URI[sha256sum] =
"98f50244f7b43f8683bd0cf5c599849d330e75e6cf077e96f14e83bda8b03ca3"
+SRC_URI[md5sum] = "f9caf558169ab650dc8200708799ebeb"
+SRC_URI[sha256sum] =
"b6d87d3e2c8757177d69aff373c91cf162f4a3944fae90fa10d086fd5f9542e7"
+
+S = "${WORKDIR}/wolfssl-${PV}-stable"
inherit autotools
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] tcpreplay: upgrade to 4.2.6
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../tcpreplay/{tcpreplay_4.1.2.bb => tcpreplay_4.2.6.bb}| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-networking/recipes-support/tcpreplay/{tcpreplay_4.1.2.bb =>
tcpreplay_4.2.6.bb} (59%)
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.2.bb
b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb
similarity index 59%
rename from meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.2.bb
rename to meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb
index 6ee9d73..681ef02 100644
--- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.2.bb
+++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb
@@ -6,10 +6,10 @@ SECTION = "net"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=890b830b22fd632e9ffd996df20338f8"
-SRC_URI =
"http://prdownloads.sourceforge.net/tcpreplay/${PV}/tcpreplay-${PV}.tar.gz;
+SRC_URI =
"https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz;
-SRC_URI[md5sum] = "3105b10b07dbc0b07ce2da07a2368359"
-SRC_URI[sha256sum] =
"da483347e83a9b5df0e0dbb0f822a2d37236e79dda35f4bc4e6684fa827f25ea"
+SRC_URI[md5sum] = "3e65d5b872e441c6a0038191a3dc7ce9"
+SRC_URI[sha256sum] =
"043756c532dab93e2be33a517ef46b1341f7239278a1045ae670041dd8a4531d"
DEPENDS = "libpcap"
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] squid: upgrade to 3.5.27
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../0001-Before-use-rpc-rpc.h-check-it-first.patch | 32 +++
...e-noexcept-instead-of-throw-for-C-11-comp.patch | 48 --
.../recipes-daemons/squid/files/gcc7-fixes.patch | 17
.../squid/{squid_3.5.26.bb => squid_3.5.27.bb} | 11 +++--
4 files changed, 39 insertions(+), 69 deletions(-)
create mode 100644
meta-networking/recipes-daemons/squid/files/0001-Before-use-rpc-rpc.h-check-it-first.patch
delete mode 100644
meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
delete mode 100644 meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
rename meta-networking/recipes-daemons/squid/{squid_3.5.26.bb =>
squid_3.5.27.bb} (93%)
diff --git
a/meta-networking/recipes-daemons/squid/files/0001-Before-use-rpc-rpc.h-check-it-first.patch
b/meta-networking/recipes-daemons/squid/files/0001-Before-use-rpc-rpc.h-check-it-first.patch
new file mode 100644
index 000..485b18c
--- /dev/null
+++
b/meta-networking/recipes-daemons/squid/files/0001-Before-use-rpc-rpc.h-check-it-first.patch
@@ -0,0 +1,32 @@
+From b5de7a89f31a17d37beb5d22857bbf829dbfb367 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Mon, 28 Aug 2017 23:17:04 -0400
+Subject: [PATCH] Before use rpc/rpc.h, check it first.
+
+When generate configure using *.m4, the ../NIS/required.m4, we should
+check the rpc/rpc.h first before using it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ helpers/basic_auth/NIS/required.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/helpers/basic_auth/NIS/required.m4
b/helpers/basic_auth/NIS/required.m4
+index fdb1360..ec4fe69 100755
+--- a/helpers/basic_auth/NIS/required.m4
b/helpers/basic_auth/NIS/required.m4
+@@ -6,7 +6,8 @@
+ ##
+
+ BUILD_HELPER="NIS"
+-AC_CHECK_HEADERS([sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h
crypt.h],[],[BUILD_HELPER=""],AC_INCLUDES_DEFAULT([
++AC_CHECK_HEADERS([rpc/rpc.h])
++AC_CHECK_HEADERS([sys/types.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h
crypt.h],[],[BUILD_HELPER=""],AC_INCLUDES_DEFAULT([
+ #if HAVE_RPC_RPC_H
+ #include
+ #endif
+--
+2.8.1
+
diff --git
a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
b/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
deleted file mode 100644
index 48674c3..000
---
a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f9150a0dc092ab2cbd47ee428436b747dce323a9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.k...@gmail.com>
-Date: Sun, 23 Apr 2017 10:28:28 -0700
-Subject: [PATCH] SquidNew: use noexcept instead of throw for C++11 compilers
-
-Fixes errors with gcc7 which is more pedantic about c++11
-conformance regarding deprecated features
-
-include/SquidNew.h:21:51: error: dynamic exception specifications are
deprecated in C++11
-_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc)
- ^
-
-Signed-off-by: Khem Raj <raj.k...@gmail.com>
- include/SquidNew.h | 8
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/SquidNew.h b/include/SquidNew.h
-index 39fcee0..c960347 100644
a/include/SquidNew.h
-+++ b/include/SquidNew.h
-@@ -18,19 +18,19 @@
- */
- #include
-
--_SQUID_EXTERNNEW_ void *operator new(size_t size) throw (std::bad_alloc)
-+_SQUID_EXTERNNEW_ void *operator new(size_t size) noexcept(false)
- {
- return xmalloc(size);
- }
--_SQUID_EXTERNNEW_ void operator delete (void *address) throw()
-+_SQUID_EXTERNNEW_ void operator delete (void *address) noexcept(true)
- {
- xfree(address);
- }
--_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc)
-+_SQUID_EXTERNNEW_ void *operator new[] (size_t size) noexcept(false)
- {
- return xmalloc(size);
- }
--_SQUID_EXTERNNEW_ void operator delete[] (void *address) throw()
-+_SQUID_EXTERNNEW_ void operator delete[] (void *address) noexcept(true)
- {
- xfree(address);
- }
---
-2.12.2
-
diff --git a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
b/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
deleted file mode 100644
index cc1ea78..000
--- a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-../../squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc: In function 'void
squidaio_init()':
../../squid-3.5.26/src/DiskIO/DiskThreads/DiskThreads.h:30:50: error: '*' in
boolean context, suggest '&&' instead [-Werror=int-in-bool-context]
#define NUMTHREADS (Config.cacheSwap.n_con
[oe] [meta-oe][PATCH V2] libvpx: upgrade to 1.6.1
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-multimedia/webm/{libvpx_1.5.0.bb => libvpx_1.6.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-multimedia/webm/{libvpx_1.5.0.bb => libvpx_1.6.1.bb}
(90%)
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb
b/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb
similarity index 90%
rename from meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb
rename to meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb
index 648818e..e17cda1 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb
+++ b/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
SRC_URI +=
"http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${BP}.tar.bz2
\
file://libvpx-configure-support-blank-prefix.patch \
"
-SRC_URI[md5sum] = "49e59dd184caa255886683facea56fca"
-SRC_URI[sha256sum] =
"306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797"
+SRC_URI[md5sum] = "a19518c8111fa93bdabdd85259162611"
+SRC_URI[sha256sum] =
"1c2c0c2a97fba9474943be34ee39337dee756780fc12870ba1dc68372586a819"
# ffmpeg links with this and fails
#
sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4):
unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] libvpx: upgrade to 1.6.0
Sorry, Please ignore this.
the upstream have already to 1.6.1, I will send it again.
On 2017年08月18日 10:55, Dengke Du wrote:
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-multimedia/webm/{libvpx_1.5.0.bb => libvpx_1.6.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-multimedia/webm/{libvpx_1.5.0.bb => libvpx_1.6.0.bb}
(90%)
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb
b/meta-oe/recipes-multimedia/webm/libvpx_1.6.0.bb
similarity index 90%
rename from meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb
rename to meta-oe/recipes-multimedia/webm/libvpx_1.6.0.bb
index 648818e..b5a8cff 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb
+++ b/meta-oe/recipes-multimedia/webm/libvpx_1.6.0.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
SRC_URI +=
"http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${BP}.tar.bz2
\
file://libvpx-configure-support-blank-prefix.patch \
"
-SRC_URI[md5sum] = "49e59dd184caa255886683facea56fca"
-SRC_URI[sha256sum] =
"306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797"
+SRC_URI[md5sum] = "f95a176768a0e1bb4fe42742e27a41af"
+SRC_URI[sha256sum] =
"d0afbb5eb1ecae68f8d578abace160a97e2e8a230e3028cf4db115d59a695aad"
# ffmpeg links with this and fails
#
sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4):
unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] libvpx: upgrade to 1.6.0
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-multimedia/webm/{libvpx_1.5.0.bb => libvpx_1.6.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-multimedia/webm/{libvpx_1.5.0.bb => libvpx_1.6.0.bb}
(90%)
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb
b/meta-oe/recipes-multimedia/webm/libvpx_1.6.0.bb
similarity index 90%
rename from meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb
rename to meta-oe/recipes-multimedia/webm/libvpx_1.6.0.bb
index 648818e..b5a8cff 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx_1.5.0.bb
+++ b/meta-oe/recipes-multimedia/webm/libvpx_1.6.0.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
SRC_URI +=
"http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${BP}.tar.bz2
\
file://libvpx-configure-support-blank-prefix.patch \
"
-SRC_URI[md5sum] = "49e59dd184caa255886683facea56fca"
-SRC_URI[sha256sum] =
"306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797"
+SRC_URI[md5sum] = "f95a176768a0e1bb4fe42742e27a41af"
+SRC_URI[sha256sum] =
"d0afbb5eb1ecae68f8d578abace160a97e2e8a230e3028cf4db115d59a695aad"
# ffmpeg links with this and fails
#
sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4):
unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] c-ares: upgrade to 1.13.0
OK, thanks.
On 2017年08月17日 17:17, Martin Jansa wrote:
There is better change for this from Alexey Firago in master-next
On Thu, Aug 17, 2017 at 10:48 AM, Dengke Du <dengke...@windriver.com
<mailto:dengke...@windriver.com>> wrote:
Signed-off-by: Dengke Du <dengke...@windriver.com
<mailto:dengke...@windriver.com>>
---
.../recipes-support/c-ares/{c-ares_1.12.0.bb
<http://c-ares_1.12.0.bb> => c-ares_1.13.0.bb
<http://c-ares_1.13.0.bb>}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-support/c-ares/{c-ares_1.12.0.bb
<http://c-ares_1.12.0.bb> => c-ares_1.13.0.bb
<http://c-ares_1.13.0.bb>} (75%)
diff --git
a/meta-networking/recipes-support/c-ares/c-ares_1.12.0.bb
<http://c-ares_1.12.0.bb>
b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb
<http://c-ares_1.13.0.bb>
similarity index 75%
rename from
meta-networking/recipes-support/c-ares/c-ares_1.12.0.bb
<http://c-ares_1.12.0.bb>
rename to meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb
<http://c-ares_1.13.0.bb>
index 4e28d6a..0d9a2a4 100644
--- a/meta-networking/recipes-support/c-ares/c-ares_1.12.0.bb
<http://c-ares_1.12.0.bb>
+++ b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb
<http://c-ares_1.13.0.bb>
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE.md;md5=f4b026880834eb01c035c5e5cb47ccac"
SRC_URI = "http://c-ares.haxx.se/download/${BP}.tar.gz
<http://c-ares.haxx.se/download/$%7BBP%7D.tar.gz> \
file://0001-configure.ac-don-t-override-passed-cflags.patch \
"
-SRC_URI[md5sum] = "2ca44be1715cd2c5666a165d35788424"
-SRC_URI[sha256sum] =
"8692f9403cdcdf936130e045c84021665118ee9bfea905d1a76f04d4e6f365fb"
+SRC_URI[md5sum] = "d2e010b43537794d8bedfb562ae6bba2"
+SRC_URI[sha256sum] =
"03f708f1b14a26ab26c38abd51137640cb444d3ec72380b21b20f1a8d2861da7"
inherit autotools pkgconfig
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
<mailto:Openembedded-devel@lists.openembedded.org>
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
<http://lists.openembedded.org/mailman/listinfo/openembedded-devel>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] c-ares: upgrade to 1.13.0
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../recipes-support/c-ares/{c-ares_1.12.0.bb => c-ares_1.13.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-support/c-ares/{c-ares_1.12.0.bb =>
c-ares_1.13.0.bb} (75%)
diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.12.0.bb
b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb
similarity index 75%
rename from meta-networking/recipes-support/c-ares/c-ares_1.12.0.bb
rename to meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb
index 4e28d6a..0d9a2a4 100644
--- a/meta-networking/recipes-support/c-ares/c-ares_1.12.0.bb
+++ b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE.md;md5=f4b026880834eb01c035c5e5cb47ccac"
SRC_URI = "http://c-ares.haxx.se/download/${BP}.tar.gz \
file://0001-configure.ac-don-t-override-passed-cflags.patch \
"
-SRC_URI[md5sum] = "2ca44be1715cd2c5666a165d35788424"
-SRC_URI[sha256sum] =
"8692f9403cdcdf936130e045c84021665118ee9bfea905d1a76f04d4e6f365fb"
+SRC_URI[md5sum] = "d2e010b43537794d8bedfb562ae6bba2"
+SRC_URI[sha256sum] =
"03f708f1b14a26ab26c38abd51137640cb444d3ec72380b21b20f1a8d2861da7"
inherit autotools pkgconfig
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH V4] php: fix install error for libphp*.so
Ping.
Thanks
Dengke
On 2017年05月09日 15:54, Dengke Du wrote:
Changed in V4:
Add the tag: meta-oe
1. Different version php have different libphp*.so, so we need to install its
corresponding libphp*.so, for example:
php-7.1.0 libphp7.so
php-5.6.26 libphp5.so
2. Fix php-5.6.26 compiling errors:
ld: TSRM/.libs/TSRM.o: undefined reference to symbol
'pthread_sigmask@@GLIBC_2.2.5'
error adding symbols: DSO missing from command line
3. Create a configure script like 70_mod_php5, we name it 70_mod_php7, this
file connect the php7 and the apache2, so they work together to let the
LAMP works correctly.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../php/php-5.6.26/0001-Add-lpthread-to-link.patch | 38 ++
meta-oe/recipes-devtools/php/php.inc | 18 +-
meta-oe/recipes-devtools/php/php/70_mod_php7.conf | 9 +
meta-oe/recipes-devtools/php/php_5.6.26.bb | 1 +
meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb | 4 +--
5 files changed, 60 insertions(+), 10 deletions(-)
create mode 100644
meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
create mode 100644 meta-oe/recipes-devtools/php/php/70_mod_php7.conf
diff --git
a/meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
b/meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
new file mode 100644
index 000..f70e550
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
@@ -0,0 +1,38 @@
+From ed0a954983d50267c2fc0bc13aba929ea0cad971 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Tue, 2 May 2017 06:34:40 +
+Subject: [PATCH] Add -lpthread to link
+
+When building the php-5.6.26, the following errors occured:
+
+ld: TSRM/.libs/TSRM.o: undefined reference to symbol
+'pthread_sigmask@@GLIBC_2.2.5'
+
+error adding symbols: DSO missing from command line
+
+This is because no pthread to link, so we should add it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ configure.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a467dff1..9afef652 100644
+--- a/configure.in
b/configure.in
+@@ -1058,7 +1058,8 @@ case $php_sapi_module in
+ ;;
+ esac
+
+-EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
++PTHREAD_LIBS="-lpthread"
++EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS $PTHREAD_LIBS"
+
+ dnl this has to be here to prevent the openssl crypt() from
+ dnl overriding the system provided crypt().
+--
+2.11.0
+
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index d3ec9de..0e55020 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -9,6 +9,8 @@ DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native
lemon-native \
openssl libmcrypt"
DEPENDS_class-native = "zlib-native libxml2-native"
+PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}"
+
SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
file://acinclude-xml2-config.patch \
file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \
@@ -24,7 +26,7 @@ SRC_URI_append_class-target = " \
file://php-fpm.conf \
file://php-fpm-apache.conf \
file://configure.patch \
-file://70_mod_php5.conf \
+file://70_mod_php${PHP_MAJOR_VERSION}.conf \
file://php-fpm.service \
"
S = "${WORKDIR}/php-${PV}"
@@ -36,7 +38,7 @@ inherit autotools pkgconfig pythonnative gettext
SSTATE_SCAN_FILES += "phpize"
SSTATE_SCAN_FILES += "build-defs.h"
-PHP_LIBDIR = "${libdir}/php5"
+PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}"
# Common EXTRA_OECONF
COMMON_EXTRA_OECONF = "--enable-sockets \
@@ -57,7 +59,7 @@ EXTRA_OECONF = "--enable-mbstring \
--with-iconv=${STAGING_LIBDIR}/.. \
--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
--with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
---with-config-file-path=${sysconfdir}/php/apache2-php5 \
+
--with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
${@base_conditional('SITEINFO_ENDIANNESS', 'le',
'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'pam', '',
'ac_cv_lib_pam_pam_start=no', d)} \
${COMMON_EXTRA_OECONF} \
@@ -175,13 +177,13 @@ do_install_append_class-target() {
if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)};
then
install -d ${D}${libdir}/apache2/modules
install -d ${D}${sysconfdir}/apache2
[oe] [meta-oe][PATCH V4] php: fix install error for libphp*.so
Changed in V4:
Add the tag: meta-oe
1. Different version php have different libphp*.so, so we need to install its
corresponding libphp*.so, for example:
php-7.1.0 libphp7.so
php-5.6.26 libphp5.so
2. Fix php-5.6.26 compiling errors:
ld: TSRM/.libs/TSRM.o: undefined reference to symbol
'pthread_sigmask@@GLIBC_2.2.5'
error adding symbols: DSO missing from command line
3. Create a configure script like 70_mod_php5, we name it 70_mod_php7, this
file connect the php7 and the apache2, so they work together to let the
LAMP works correctly.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../php/php-5.6.26/0001-Add-lpthread-to-link.patch | 38 ++
meta-oe/recipes-devtools/php/php.inc | 18 +-
meta-oe/recipes-devtools/php/php/70_mod_php7.conf | 9 +
meta-oe/recipes-devtools/php/php_5.6.26.bb | 1 +
meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb | 4 +--
5 files changed, 60 insertions(+), 10 deletions(-)
create mode 100644
meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
create mode 100644 meta-oe/recipes-devtools/php/php/70_mod_php7.conf
diff --git
a/meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
b/meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
new file mode 100644
index 000..f70e550
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
@@ -0,0 +1,38 @@
+From ed0a954983d50267c2fc0bc13aba929ea0cad971 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Tue, 2 May 2017 06:34:40 +
+Subject: [PATCH] Add -lpthread to link
+
+When building the php-5.6.26, the following errors occured:
+
+ld: TSRM/.libs/TSRM.o: undefined reference to symbol
+'pthread_sigmask@@GLIBC_2.2.5'
+
+error adding symbols: DSO missing from command line
+
+This is because no pthread to link, so we should add it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ configure.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a467dff1..9afef652 100644
+--- a/configure.in
b/configure.in
+@@ -1058,7 +1058,8 @@ case $php_sapi_module in
+ ;;
+ esac
+
+-EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
++PTHREAD_LIBS="-lpthread"
++EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS $PTHREAD_LIBS"
+
+ dnl this has to be here to prevent the openssl crypt() from
+ dnl overriding the system provided crypt().
+--
+2.11.0
+
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index d3ec9de..0e55020 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -9,6 +9,8 @@ DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native
lemon-native \
openssl libmcrypt"
DEPENDS_class-native = "zlib-native libxml2-native"
+PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}"
+
SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
file://acinclude-xml2-config.patch \
file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \
@@ -24,7 +26,7 @@ SRC_URI_append_class-target = " \
file://php-fpm.conf \
file://php-fpm-apache.conf \
file://configure.patch \
-file://70_mod_php5.conf \
+file://70_mod_php${PHP_MAJOR_VERSION}.conf \
file://php-fpm.service \
"
S = "${WORKDIR}/php-${PV}"
@@ -36,7 +38,7 @@ inherit autotools pkgconfig pythonnative gettext
SSTATE_SCAN_FILES += "phpize"
SSTATE_SCAN_FILES += "build-defs.h"
-PHP_LIBDIR = "${libdir}/php5"
+PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}"
# Common EXTRA_OECONF
COMMON_EXTRA_OECONF = "--enable-sockets \
@@ -57,7 +59,7 @@ EXTRA_OECONF = "--enable-mbstring \
--with-iconv=${STAGING_LIBDIR}/.. \
--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
--with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
---with-config-file-path=${sysconfdir}/php/apache2-php5 \
+
--with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
${@base_conditional('SITEINFO_ENDIANNESS', 'le',
'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'pam', '',
'ac_cv_lib_pam_pam_start=no', d)} \
${COMMON_EXTRA_OECONF} \
@@ -175,13 +177,13 @@ do_install_append_class-target() {
if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)};
then
install -d ${D}${libdir}/apache2/modules
install -d ${D}${sysconfdir}/apache2/modules.d
-install -d ${D}${sysconfdir}/php/apache2-php5
-install -m 755 libs/libphp5.s
[oe] [PATCH V3] php: fix install error for libphp*.so
1. Different version php have different libphp*.so, so we need to install its
corresponding libphp*.so, for example:
php-7.1.0 libphp7.so
php-5.6.26 libphp5.so
2. Fix php-5.6.26 compiling errors:
ld: TSRM/.libs/TSRM.o: undefined reference to symbol
'pthread_sigmask@@GLIBC_2.2.5'
error adding symbols: DSO missing from command line
3. Create a configure script like 70_mod_php5, we name it 70_mod_php7, this
file connect the php7 and the apache2, so they work together to let the
LAMP works correctly.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../php/php-5.6.26/0001-Add-lpthread-to-link.patch | 38 ++
meta-oe/recipes-devtools/php/php.inc | 18 +-
meta-oe/recipes-devtools/php/php/70_mod_php7.conf | 9 +
meta-oe/recipes-devtools/php/php_5.6.26.bb | 1 +
meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb | 4 +--
5 files changed, 60 insertions(+), 10 deletions(-)
create mode 100644
meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
create mode 100644 meta-oe/recipes-devtools/php/php/70_mod_php7.conf
diff --git
a/meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
b/meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
new file mode 100644
index 000..f70e550
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
@@ -0,0 +1,38 @@
+From ed0a954983d50267c2fc0bc13aba929ea0cad971 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Tue, 2 May 2017 06:34:40 +
+Subject: [PATCH] Add -lpthread to link
+
+When building the php-5.6.26, the following errors occured:
+
+ld: TSRM/.libs/TSRM.o: undefined reference to symbol
+'pthread_sigmask@@GLIBC_2.2.5'
+
+error adding symbols: DSO missing from command line
+
+This is because no pthread to link, so we should add it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ configure.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a467dff1..9afef652 100644
+--- a/configure.in
b/configure.in
+@@ -1058,7 +1058,8 @@ case $php_sapi_module in
+ ;;
+ esac
+
+-EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
++PTHREAD_LIBS="-lpthread"
++EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS $PTHREAD_LIBS"
+
+ dnl this has to be here to prevent the openssl crypt() from
+ dnl overriding the system provided crypt().
+--
+2.11.0
+
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index d3ec9de..0e55020 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -9,6 +9,8 @@ DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native
lemon-native \
openssl libmcrypt"
DEPENDS_class-native = "zlib-native libxml2-native"
+PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}"
+
SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
file://acinclude-xml2-config.patch \
file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \
@@ -24,7 +26,7 @@ SRC_URI_append_class-target = " \
file://php-fpm.conf \
file://php-fpm-apache.conf \
file://configure.patch \
-file://70_mod_php5.conf \
+file://70_mod_php${PHP_MAJOR_VERSION}.conf \
file://php-fpm.service \
"
S = "${WORKDIR}/php-${PV}"
@@ -36,7 +38,7 @@ inherit autotools pkgconfig pythonnative gettext
SSTATE_SCAN_FILES += "phpize"
SSTATE_SCAN_FILES += "build-defs.h"
-PHP_LIBDIR = "${libdir}/php5"
+PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}"
# Common EXTRA_OECONF
COMMON_EXTRA_OECONF = "--enable-sockets \
@@ -57,7 +59,7 @@ EXTRA_OECONF = "--enable-mbstring \
--with-iconv=${STAGING_LIBDIR}/.. \
--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
--with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
---with-config-file-path=${sysconfdir}/php/apache2-php5 \
+
--with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
${@base_conditional('SITEINFO_ENDIANNESS', 'le',
'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'pam', '',
'ac_cv_lib_pam_pam_start=no', d)} \
${COMMON_EXTRA_OECONF} \
@@ -175,13 +177,13 @@ do_install_append_class-target() {
if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)};
then
install -d ${D}${libdir}/apache2/modules
install -d ${D}${sysconfdir}/apache2/modules.d
-install -d ${D}${sysconfdir}/php/apache2-php5
-install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules
-
[oe] [meta-oe][PATCH] phoronix-test-suite: remove it from blacklist
The phoronix-test-suite was in blacklist, because the php-cli can't work,
the php-cli can work now, so remove it from blacklist.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.6.1.bb | 2 --
1 file changed, 2 deletions(-)
diff --git
a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.6.1.bb
b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.6.1.bb
index e2df4e8..fd244b4 100644
--- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.6.1.bb
+++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.6.1.bb
@@ -34,5 +34,3 @@ FILES_${PN} += " \
${datadir}/mime/packages/openbenchmarking-mime.xml \
${systemd_unitdir}/* \
"
-
-PNBLACKLIST[phoronix-test-suite] ?= "Runtime depends on blacklisted php-cli -
the recipe will be removed on 2017-09-01 unless the issue is fixed"
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] crash: fix build failure with mips
When build crash with mips:
mips-linux-nat.c:157:1: error: conflicting types for 'ps_get_thread_area'
ps_get_thread_area (const struct ps_prochandle *ph,
^~
In file included from gdb_proc_service.h:26:0,
from mips-linux-nat.c:32:
This problem have been fixed on intel and arm plantform, we can use the
similar approch to fix it on mips.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../0004-crash-fix-build-failure-with-mips.patch | 87 ++
meta-oe/recipes-kernel/crash/crash_7.1.8.bb| 1 +
2 files changed, 88 insertions(+)
create mode 100644
meta-oe/recipes-kernel/crash/crash/0004-crash-fix-build-failure-with-mips.patch
diff --git
a/meta-oe/recipes-kernel/crash/crash/0004-crash-fix-build-failure-with-mips.patch
b/meta-oe/recipes-kernel/crash/crash/0004-crash-fix-build-failure-with-mips.patch
new file mode 100644
index 000..1e7ce6b
--- /dev/null
+++
b/meta-oe/recipes-kernel/crash/crash/0004-crash-fix-build-failure-with-mips.patch
@@ -0,0 +1,87 @@
+From 423ebdce07aa9f398f32c0adf659353069d023c6 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Thu, 4 May 2017 07:14:13 +
+Subject: [PATCH] crash: fix build failure with mips
+
+When build crash with mips:
+
+
+mips-linux-nat.c:157:1: error: conflicting types for 'ps_get_thread_area'
+ ps_get_thread_area (const struct ps_prochandle *ph,
+ ^~
+In file included from gdb_proc_service.h:26:0,
+ from mips-linux-nat.c:32:
+
+
+This problem have been fixed on intel and arm plantform, we can use the
+similar approch to fix it on mips.
+
+Upstream-status: Submitted [https://github.com/crash-utility/crash/pull/11]
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ Makefile| 1 +
+ crash-fix-build-failure-with-mips.patch | 39 +
+ 2 files changed, 40 insertions(+)
+ create mode 100644 crash-fix-build-failure-with-mips.patch
+
+diff --git a/Makefile b/Makefile
+index 5496523..2ec3325 100644
+--- a/Makefile
b/Makefile
+@@ -268,6 +268,7 @@ gdb_patch:
+ grep 'extern ps_err_e ps_get_thread_area (struct'
${RECIPE_SYSROOT}/usr/include/proc_service.h; \
+ if [ $$? -eq 0 ]; then \
+ patch -p0 < ${GDB}-proc_service.h.patch; \
++ patch -p1 < crash-fix-build-failure-with-mips.patch; \
+ fi; \
+ fi
+
+diff --git a/crash-fix-build-failure-with-mips.patch
b/crash-fix-build-failure-with-mips.patch
+new file mode 100644
+index 000..0c70c5f
+--- /dev/null
b/crash-fix-build-failure-with-mips.patch
+@@ -0,0 +1,39 @@
++From 615c802d9c73fad48723b6567042cd54f6795849 Mon Sep 17 00:00:00 2001
++From: Dengke Du <dengke...@windriver.com>
++Date: Thu, 4 May 2017 06:14:47 +
++Subject: [PATCH] crash: fix build failure with mips
++
++When build crash with mips:
++
++~
++mips-linux-nat.c:157:1: error: conflicting types for 'ps_get_thread_area'
++ ps_get_thread_area (const struct ps_prochandle *ph,
++ ^~
++In file included from gdb_proc_service.h:26:0,
++ from mips-linux-nat.c:32:
++~
++
++This problem have been fixed on intel and arm plantform, we can use the
++similar approch to fix it on mips.
++
++Signed-off-by: Dengke Du <dengke...@windriver.com>
++---
++ gdb-7.6/gdb/mips-linux-nat.c | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/gdb-7.6/gdb/mips-linux-nat.c b/gdb-7.6/gdb/mips-linux-nat.c
++index 61e83c6..d517e37 100644
++--- a/gdb-7.6/gdb/mips-linux-nat.c
+ b/gdb-7.6/gdb/mips-linux-nat.c
++@@ -154,7 +154,7 @@ mips64_linux_register_addr (struct gdbarch *gdbarch, int
regno, int store)
++ /* Fetch the thread-local storage pointer for libthread_db. */
++
++ ps_err_e
++-ps_get_thread_area (const struct ps_prochandle *ph,
+++ps_get_thread_area (struct ps_prochandle *ph,
++ lwpid_t lwpid, int idx, void **base)
++ {
++ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
++--
++2.11.0
++
+--
+2.11.0
+
diff --git a/meta-oe/recipes-kernel/crash/crash_7.1.8.bb
b/meta-oe/recipes-kernel/crash/crash_7.1.8.bb
index 012ef1a..9cbb291 100644
--- a/meta-oe/recipes-kernel/crash/crash_7.1.8.bb
+++ b/meta-oe/recipes-kernel/crash/crash_7.1.8.bb
@@ -25,6 +25,7 @@ SRC_URI =
"https://github.com/crash-utility/${BPN}/archive/${PV}.tar.gz;download
file://0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch \
Re: [oe] [PATCH V2] crash: 7.1.5 -> 7.1.8
On 2017年04月21日 18:53, Anders Darander wrote: Hi, * Dengke Du <dengke...@windriver.com> [170421 12:18]: On 2017年04月18日 20:20, Anders Darander wrote: * Dengke Du <dengke...@windriver.com> [170412 07:42]: 2. Add the "id" to HOSTTOOLS in meta-oe/layer.conf Why do you need to add `id` to HOSTTOOLS? It's not me decide to add "id" to HOSTTOOLS, it's the crash source code decides: In ./Makefile line 563: ~ release: make_configure @if [ "`id --user`" != "0" ]; then \ echo "make release: must be super-user"; exit 1; fi How is this going to work? We're not running make as root, thus the build will fail!?! Or what am I missing? Yes, in recipe crash_7.1.8.bb, the do_compile function run as non-root. I'd say, can you try to remove those two lines instead, and see if it builds correctly? I have check the source codes, I think remove those two lines is OK. Besides, are we really running `make release`? I can't find anything obvious in either the Makefile or the recipe, that calls `make release`. It's not runing on surface, but you can run "bitbake crash" without the id in HOSTTOOLS, the do_compile will fail. We're normally trying to _increase_ determinism in builds, not reduce it... I've got really hard time to see why something needs to run `id` in order to build properly... Cheers, Anders -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH V2] crash: 7.1.5 -> 7.1.8
Hi Anders
On 2017年04月18日 20:20, Anders Darander wrote:
* Dengke Du <dengke...@windriver.com> [170412 07:42]:
2. Add the "id" to HOSTTOOLS in meta-oe/layer.conf
Why do you need to add `id` to HOSTTOOLS?
It's not me decide to add "id" to HOSTTOOLS, it's the crash source code
decides:
In ./Makefile line 563:
~
release: make_configure
@if [ "`id --user`" != "0" ]; then \
echo "make release: must be super-user"; exit 1; fi
@./configure -P "RPMPKG=${RPMPKG}" -u -g
@make --no-print-directory release_configure
@echo
@echo "cvs tag this release if necessary"
~
We're normally trying to _increase_ determinism in builds, not reduce
it...
Cheers,
Anders
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] php: fix install error for libphp*.so
Please ignore this, thanks!
//dengke
On 2017年04月13日 15:37, Dengke Du wrote:
Different version php have different libphp*.so, so we need to install its
corresponding libphp*.so, for example:
php-7.1.0 libphp7.so
php-5.6.26 libphp5.so
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-devtools/php/php.inc | 6 +-
meta-oe/recipes-devtools/php/php_5.6.26.bb | 2 --
meta-oe/recipes-devtools/php/php_7.1.0.bb | 2 --
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index d3ec9de..7f37daa 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -176,7 +176,11 @@ do_install_append_class-target() {
install -d ${D}${libdir}/apache2/modules
install -d ${D}${sysconfdir}/apache2/modules.d
install -d ${D}${sysconfdir}/php/apache2-php5
-install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules
+if [[ ${PV} == 7* ]]; then
+install -m 755 libs/libphp7.so ${D}${libdir}/apache2/modules
+elif [[ ${PV} == 5* ]]; then
+install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules
+fi
install -m 644 ${WORKDIR}/70_mod_php5.conf
${D}${sysconfdir}/apache2/modules.d
sed -i s,lib/,${libdir}/,
${D}${sysconfdir}/apache2/modules.d/70_mod_php5.conf
cat ${S}/php.ini-production | \
diff --git a/meta-oe/recipes-devtools/php/php_5.6.26.bb
b/meta-oe/recipes-devtools/php/php_5.6.26.bb
index c5698f8..ddc7ce3 100644
--- a/meta-oe/recipes-devtools/php/php_5.6.26.bb
+++ b/meta-oe/recipes-devtools/php/php_5.6.26.bb
@@ -7,5 +7,3 @@ SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
"
SRC_URI[md5sum] = "cb424b705cfb715fc04f499f8a8cf52e"
SRC_URI[sha256sum] =
"d47aab8083a4284b905777e1b45dd7735adc53be827b29f896684750ac8b6236"
-
-PNBLACKLIST[php] ?= "Fails to build with RSS
http://errors.yoctoproject.org/Errors/Details/131630/;
diff --git a/meta-oe/recipes-devtools/php/php_7.1.0.bb
b/meta-oe/recipes-devtools/php/php_7.1.0.bb
index ee8155c..210d91f 100644
--- a/meta-oe/recipes-devtools/php/php_7.1.0.bb
+++ b/meta-oe/recipes-devtools/php/php_7.1.0.bb
@@ -12,5 +12,3 @@ PACKAGECONFIG[mysql] =
"--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
,mysql5"
FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default"
-
-PNBLACKLIST[php] ?= "Fails to build with RSS
http://errors.yoctoproject.org/Errors/Details/130601/;
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH V2] php: fix install error for libphp*.so
Different version php have different libphp*.so, so we need to install its
corresponding libphp*.so, for example:
php-7.1.0 libphp7.so
php-5.6.26 libphp5.so
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-devtools/php/php.inc | 6 +-
meta-oe/recipes-devtools/php/php_5.6.26.bb | 2 --
meta-oe/recipes-devtools/php/php_7.1.0.bb | 2 --
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index d3ec9de..7f37daa 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -176,7 +176,11 @@ do_install_append_class-target() {
install -d ${D}${libdir}/apache2/modules
install -d ${D}${sysconfdir}/apache2/modules.d
install -d ${D}${sysconfdir}/php/apache2-php5
-install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules
+if [[ ${PV} == 7* ]]; then
+install -m 755 libs/libphp7.so ${D}${libdir}/apache2/modules
+elif [[ ${PV} == 5* ]]; then
+install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules
+fi
install -m 644 ${WORKDIR}/70_mod_php5.conf
${D}${sysconfdir}/apache2/modules.d
sed -i s,lib/,${libdir}/,
${D}${sysconfdir}/apache2/modules.d/70_mod_php5.conf
cat ${S}/php.ini-production | \
diff --git a/meta-oe/recipes-devtools/php/php_5.6.26.bb
b/meta-oe/recipes-devtools/php/php_5.6.26.bb
index c5698f8..ddc7ce3 100644
--- a/meta-oe/recipes-devtools/php/php_5.6.26.bb
+++ b/meta-oe/recipes-devtools/php/php_5.6.26.bb
@@ -7,5 +7,3 @@ SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
"
SRC_URI[md5sum] = "cb424b705cfb715fc04f499f8a8cf52e"
SRC_URI[sha256sum] =
"d47aab8083a4284b905777e1b45dd7735adc53be827b29f896684750ac8b6236"
-
-PNBLACKLIST[php] ?= "Fails to build with RSS
http://errors.yoctoproject.org/Errors/Details/131630/;
diff --git a/meta-oe/recipes-devtools/php/php_7.1.0.bb
b/meta-oe/recipes-devtools/php/php_7.1.0.bb
index ee8155c..210d91f 100644
--- a/meta-oe/recipes-devtools/php/php_7.1.0.bb
+++ b/meta-oe/recipes-devtools/php/php_7.1.0.bb
@@ -12,5 +12,3 @@ PACKAGECONFIG[mysql] =
"--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
,mysql5"
FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default"
-
-PNBLACKLIST[php] ?= "Fails to build with RSS
http://errors.yoctoproject.org/Errors/Details/130601/;
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] php: fix install error for libphp*.so
Different version php have different libphp*.so, so we need to install its
corresponding libphp*.so, for example:
php-7.1.0 libphp7.so
php-5.6.26 libphp5.so
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-devtools/php/php.inc | 6 +-
meta-oe/recipes-devtools/php/php_5.6.26.bb | 2 --
meta-oe/recipes-devtools/php/php_7.1.0.bb | 2 --
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index d3ec9de..7f37daa 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -176,7 +176,11 @@ do_install_append_class-target() {
install -d ${D}${libdir}/apache2/modules
install -d ${D}${sysconfdir}/apache2/modules.d
install -d ${D}${sysconfdir}/php/apache2-php5
-install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules
+if [[ ${PV} == 7* ]]; then
+install -m 755 libs/libphp7.so ${D}${libdir}/apache2/modules
+elif [[ ${PV} == 5* ]]; then
+install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules
+fi
install -m 644 ${WORKDIR}/70_mod_php5.conf
${D}${sysconfdir}/apache2/modules.d
sed -i s,lib/,${libdir}/,
${D}${sysconfdir}/apache2/modules.d/70_mod_php5.conf
cat ${S}/php.ini-production | \
diff --git a/meta-oe/recipes-devtools/php/php_5.6.26.bb
b/meta-oe/recipes-devtools/php/php_5.6.26.bb
index c5698f8..ddc7ce3 100644
--- a/meta-oe/recipes-devtools/php/php_5.6.26.bb
+++ b/meta-oe/recipes-devtools/php/php_5.6.26.bb
@@ -7,5 +7,3 @@ SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
"
SRC_URI[md5sum] = "cb424b705cfb715fc04f499f8a8cf52e"
SRC_URI[sha256sum] =
"d47aab8083a4284b905777e1b45dd7735adc53be827b29f896684750ac8b6236"
-
-PNBLACKLIST[php] ?= "Fails to build with RSS
http://errors.yoctoproject.org/Errors/Details/131630/;
diff --git a/meta-oe/recipes-devtools/php/php_7.1.0.bb
b/meta-oe/recipes-devtools/php/php_7.1.0.bb
index ee8155c..210d91f 100644
--- a/meta-oe/recipes-devtools/php/php_7.1.0.bb
+++ b/meta-oe/recipes-devtools/php/php_7.1.0.bb
@@ -12,5 +12,3 @@ PACKAGECONFIG[mysql] =
"--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
,mysql5"
FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default"
-
-PNBLACKLIST[php] ?= "Fails to build with RSS
http://errors.yoctoproject.org/Errors/Details/130601/;
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH V2] crash: 7.1.5 -> 7.1.8
1. Upgrade crash to fix build failure with glibc 2.25.
2. Add the "id" to HOSTTOOLS in meta-oe/layer.conf
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/conf/layer.conf| 2 +
...ompilation-error-if-glibc-2.25-or-later-h.patch | 112 +
.../crash/0001-cross_add_configure_option.patch| 13 +--
...uild-error-unknown-type-name-gdb_fpregset.patch | 36 +++
...sh-detect-the-sysroot-s-glibc-header-file.patch | 33 ++
.../crash/{crash_7.1.5.bb => crash_7.1.8.bb} | 11 +-
6 files changed, 196 insertions(+), 11 deletions(-)
create mode 100644
meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
create mode 100644
meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch
create mode 100644
meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch
rename meta-oe/recipes-kernel/crash/{crash_7.1.5.bb => crash_7.1.8.bb} (91%)
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index bdc8210..54425c6 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -79,3 +79,5 @@ FREESMARTPHONE_GIT = "git://git.freesmartphone.org"
# Override security flags
require conf/distro/include/meta_oe_security_flags.inc
+
+HOSTTOOLS += "id"
diff --git
a/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
b/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
new file mode 100644
index 000..9434815
--- /dev/null
+++
b/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
@@ -0,0 +1,112 @@
+From b8c8fbe0a2481e97fc57dd596346827a692a5768 Mon Sep 17 00:00:00 2001
+From: Dave Anderson <ander...@redhat.com>
+Date: Tue, 28 Mar 2017 15:44:40 -0400
+Subject: [PATCH 1/3] Fix for a compilation error if glibc-2.25 or later has
+ been installed on the host build machine. Without the patch, the build fails
+ with the error message "amd64-linux-nat.c:496:1: error: conflicting types for
+ 'ps_get_thread_area'". (ander...@redhat.com)
+
+Upstream-Status: Backport
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ Makefile | 6 +
+ configure.c | 2 +-
+ gdb-7.6-proc_service.h.patch | 55
+ 3 files changed, 62 insertions(+), 1 deletion(-)
+ create mode 100644 gdb-7.6-proc_service.h.patch
+
+diff --git a/Makefile b/Makefile
+index 202ef8b..b6b7e80 100644
+--- a/Makefile
b/Makefile
+@@ -264,6 +264,12 @@ gdb_patch:
+ if [ "${ARCH}" = "x86_64" ] && [ "${TARGET}" = "PPC64" ] && [ -f
${GDB}-ppc64le-support.patch ]; then \
+ patch -d ${GDB} -p1 -F0 < ${GDB}-ppc64le-support.patch ; \
+ fi
++ if [ -f /usr/include/proc_service.h ]; then \
++ grep 'extern ps_err_e ps_get_thread_area (struct'
/usr/include/proc_service.h; \
++ if [ $$? -eq 0 ]; then \
++ patch -p0 < ${GDB}-proc_service.h.patch; \
++ fi; \
++ fi
+
+ library: make_build_data ${OBJECT_FILES}
+ ar -rs ${PROGRAM}lib.a ${OBJECT_FILES}
+diff --git a/configure.c b/configure.c
+index d63cdd7..776defe 100644
+--- a/configure.c
b/configure.c
+@@ -240,7 +240,7 @@ struct supported_gdb_version {
+ "7.6",
+ "GDB_FILES=${GDB_7.6_FILES}",
+ "GDB_OFILES=${GDB_7.6_OFILES}",
+- "GDB_PATCH_FILES=gdb-7.6.patch gdb-7.6-ppc64le-support.patch",
++ "GDB_PATCH_FILES=gdb-7.6.patch gdb-7.6-ppc64le-support.patch
gdb-7.6-proc_service.h.patch",
+ "GDB_FLAGS=-DGDB_7_6",
+ "GPLv3"
+ },
+diff --git a/gdb-7.6-proc_service.h.patch b/gdb-7.6-proc_service.h.patch
+new file mode 100644
+index 000..49d18bb
+--- /dev/null
b/gdb-7.6-proc_service.h.patch
+@@ -0,0 +1,55 @@
++--- gdb-7.6/gdb/gdb_proc_service.h.orig
+ gdb-7.6/gdb/gdb_proc_service.h
++@@ -115,7 +115,7 @@ extern pid_t ps_getpid (struct ps_procha
++ /* Fetch the special per-thread address associated with the given LWP.
++This call is only used on a few platforms (most use a normal register).
++The meaning of the `int' parameter is machine-dependent. */
++-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
+++extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
++ lwpid_t, int, psaddr_t *);
++
++
++--- gdb-7.6/gdb/amd64-linux-nat.c.orig
+ gdb-7.6/gdb/amd64-linux-nat.c
++@@ -493,7 +493,7 @@ amd64_linux_new_fork (struct lwp_info *p
++a request for a thread's local storage address. */
++
++ ps_err_e
++-ps_get_thread_area (const struct ps_proch
Re: [oe] [PATCH] crash: 7.1.5 -> 7.1.8
On 2017年04月12日 12:03, Peter Kjellerstedt wrote:
This patch need to add the "id cc" to HOSTTOOLS in bitbake.conf in
oe-core, I will send the patch to oe-core later.
I doubt you will get either "id" or "cc" accepted into HOSTTOOLS
in OE-Core. Definitely not "cc" as recipes are expected to use
${BUILD_CC} (which uses "gcc") for the host compiler. And probably
Thanks, I find the "cc" come from patch:
0001-cross_add_configure_option.patch
in ./meta-openembedded/meta-oe/recipes-kernel/crash/crash
From cbaaa42933bb27b1bcff4c7d71d54c913201ee88 Mon Sep 17 00:00:00 2001
From: Lei Maohui
Date: Fri, 9 Jan 2015 11:51:18 +0900
Subject: [PATCH] cross_add_configure_option
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 9c44633..39bebd0 100644
--- a/Makefile
+++ b/Makefile
@@ -232,7 +232,7 @@ gdb_merge: force
@echo "../../${PROGRAM} ../../${PROGRAM}lib.a" >
${GDB}/gdb/mergeobj
@rm -f ${PROGRAM}
@if [ ! -f ${GDB}/config.status ]; then \
- (cd ${GDB}; ./configure ${GDB_CONF_FLAGS}
--with-separate-debug-dir=/usr/lib/debug \
+ (cd ${GDB}; ./configure --host=${GDB_TARGET}
--build=${GDB_HOST} --with-separate-debug-dir=/usr/lib/debug \
--with-bugurl="" --with-expat=no --with-python=no
--disable-sim; \
make --no-print-directory CRASH_TARGET=${TARGET}; echo
${TARGET} > crash.target) \
else make --no-print-directory rebuild; fi
@@ -277,7 +277,7 @@ force:
make_configure: force
@rm -f configure
- @${CC} ${CONF_FLAGS} -o configure configure.c ${WARNING_ERROR}
${WARNING_OPTIONS}
+ @cc ${CONF_FLAGS} -o configure configure.c ${WARNING_ERROR}
${WARNING_OPTIONS}
clean: make_configure
@./configure ${CONF_TARGET_FLAG} -q -b
--
1.8.4.2
~
I will check the above patch now.
The "id" is here:
https://github.com/crash-utility/crash/blob/master/Makefile#L567
not "id" unless you have a very good explanation for why it is
needed. The problem with "id" is that it is typically used to get
information about the running user, which makes it a problem from
a deterministic view. Also, since nothing in OE-Core requires "id",
there is no reason to add it there. It could be added to layer.conf
in meta-oe, but the concerns about determinism still stands.
//Peter
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] crash: 7.1.5 -> 7.1.8
This patch need to add the "id cc" to HOSTTOOLS in bitbake.conf in
oe-core, I will send the patch to oe-core later.
On 2017年04月12日 10:03, Dengke Du wrote:
Upgrade crash to fix build failure with glibc 2.25.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
...ompilation-error-if-glibc-2.25-or-later-h.patch | 112 +
...uild-error-unknown-type-name-gdb_fpregset.patch | 36 +++
...sh-detect-the-sysroot-s-glibc-header-file.patch | 33 ++
.../crash/{crash_7.1.5.bb => crash_7.1.8.bb} | 11 +-
4 files changed, 187 insertions(+), 5 deletions(-)
create mode 100644
meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
create mode 100644
meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch
create mode 100644
meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch
rename meta-oe/recipes-kernel/crash/{crash_7.1.5.bb => crash_7.1.8.bb} (91%)
diff --git
a/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
b/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
new file mode 100644
index 000..9434815
--- /dev/null
+++
b/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
@@ -0,0 +1,112 @@
+From b8c8fbe0a2481e97fc57dd596346827a692a5768 Mon Sep 17 00:00:00 2001
+From: Dave Anderson <ander...@redhat.com>
+Date: Tue, 28 Mar 2017 15:44:40 -0400
+Subject: [PATCH 1/3] Fix for a compilation error if glibc-2.25 or later has
+ been installed on the host build machine. Without the patch, the build fails
+ with the error message "amd64-linux-nat.c:496:1: error: conflicting types for
+ 'ps_get_thread_area'". (ander...@redhat.com)
+
+Upstream-Status: Backport
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ Makefile | 6 +
+ configure.c | 2 +-
+ gdb-7.6-proc_service.h.patch | 55
+ 3 files changed, 62 insertions(+), 1 deletion(-)
+ create mode 100644 gdb-7.6-proc_service.h.patch
+
+diff --git a/Makefile b/Makefile
+index 202ef8b..b6b7e80 100644
+--- a/Makefile
b/Makefile
+@@ -264,6 +264,12 @@ gdb_patch:
+ if [ "${ARCH}" = "x86_64" ] && [ "${TARGET}" = "PPC64" ] && [ -f
${GDB}-ppc64le-support.patch ]; then \
+ patch -d ${GDB} -p1 -F0 < ${GDB}-ppc64le-support.patch ; \
+ fi
++ if [ -f /usr/include/proc_service.h ]; then \
++ grep 'extern ps_err_e ps_get_thread_area (struct'
/usr/include/proc_service.h; \
++ if [ $$? -eq 0 ]; then \
++ patch -p0 < ${GDB}-proc_service.h.patch; \
++ fi; \
++ fi
+
+ library: make_build_data ${OBJECT_FILES}
+ ar -rs ${PROGRAM}lib.a ${OBJECT_FILES}
+diff --git a/configure.c b/configure.c
+index d63cdd7..776defe 100644
+--- a/configure.c
b/configure.c
+@@ -240,7 +240,7 @@ struct supported_gdb_version {
+ "7.6",
+ "GDB_FILES=${GDB_7.6_FILES}",
+ "GDB_OFILES=${GDB_7.6_OFILES}",
+- "GDB_PATCH_FILES=gdb-7.6.patch gdb-7.6-ppc64le-support.patch",
++ "GDB_PATCH_FILES=gdb-7.6.patch gdb-7.6-ppc64le-support.patch
gdb-7.6-proc_service.h.patch",
+ "GDB_FLAGS=-DGDB_7_6",
+ "GPLv3"
+ },
+diff --git a/gdb-7.6-proc_service.h.patch b/gdb-7.6-proc_service.h.patch
+new file mode 100644
+index 000..49d18bb
+--- /dev/null
b/gdb-7.6-proc_service.h.patch
+@@ -0,0 +1,55 @@
++--- gdb-7.6/gdb/gdb_proc_service.h.orig
+ gdb-7.6/gdb/gdb_proc_service.h
++@@ -115,7 +115,7 @@ extern pid_t ps_getpid (struct ps_procha
++ /* Fetch the special per-thread address associated with the given LWP.
++This call is only used on a few platforms (most use a normal register).
++The meaning of the `int' parameter is machine-dependent. */
++-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
+++extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
++ lwpid_t, int, psaddr_t *);
++
++
++--- gdb-7.6/gdb/amd64-linux-nat.c.orig
+ gdb-7.6/gdb/amd64-linux-nat.c
++@@ -493,7 +493,7 @@ amd64_linux_new_fork (struct lwp_info *p
++a request for a thread's local storage address. */
++
++ ps_err_e
++-ps_get_thread_area (const struct ps_prochandle *ph,
+++ps_get_thread_area (struct ps_prochandle *ph,
++ lwpid_t lwpid, int idx, void **base)
++ {
++ if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32)
++--- gdb-7.6/gdb/aarch64-linux-nat.c.orig
+ gdb-7.6/gdb/aarch64-linux-nat.c
++@@ -750,7 +750,7 @@ aarch64_linux_new_fork (struct lwp_info
++storage (or its
[oe] [PATCH] crash: 7.1.5 -> 7.1.8
Upgrade crash to fix build failure with glibc 2.25.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
...ompilation-error-if-glibc-2.25-or-later-h.patch | 112 +
...uild-error-unknown-type-name-gdb_fpregset.patch | 36 +++
...sh-detect-the-sysroot-s-glibc-header-file.patch | 33 ++
.../crash/{crash_7.1.5.bb => crash_7.1.8.bb} | 11 +-
4 files changed, 187 insertions(+), 5 deletions(-)
create mode 100644
meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
create mode 100644
meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch
create mode 100644
meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch
rename meta-oe/recipes-kernel/crash/{crash_7.1.5.bb => crash_7.1.8.bb} (91%)
diff --git
a/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
b/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
new file mode 100644
index 000..9434815
--- /dev/null
+++
b/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-a-compilation-error-if-glibc-2.25-or-later-h.patch
@@ -0,0 +1,112 @@
+From b8c8fbe0a2481e97fc57dd596346827a692a5768 Mon Sep 17 00:00:00 2001
+From: Dave Anderson <ander...@redhat.com>
+Date: Tue, 28 Mar 2017 15:44:40 -0400
+Subject: [PATCH 1/3] Fix for a compilation error if glibc-2.25 or later has
+ been installed on the host build machine. Without the patch, the build fails
+ with the error message "amd64-linux-nat.c:496:1: error: conflicting types for
+ 'ps_get_thread_area'". (ander...@redhat.com)
+
+Upstream-Status: Backport
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ Makefile | 6 +
+ configure.c | 2 +-
+ gdb-7.6-proc_service.h.patch | 55
+ 3 files changed, 62 insertions(+), 1 deletion(-)
+ create mode 100644 gdb-7.6-proc_service.h.patch
+
+diff --git a/Makefile b/Makefile
+index 202ef8b..b6b7e80 100644
+--- a/Makefile
b/Makefile
+@@ -264,6 +264,12 @@ gdb_patch:
+ if [ "${ARCH}" = "x86_64" ] && [ "${TARGET}" = "PPC64" ] && [ -f
${GDB}-ppc64le-support.patch ]; then \
+ patch -d ${GDB} -p1 -F0 < ${GDB}-ppc64le-support.patch ; \
+ fi
++ if [ -f /usr/include/proc_service.h ]; then \
++ grep 'extern ps_err_e ps_get_thread_area (struct'
/usr/include/proc_service.h; \
++ if [ $$? -eq 0 ]; then \
++ patch -p0 < ${GDB}-proc_service.h.patch; \
++ fi; \
++ fi
+
+ library: make_build_data ${OBJECT_FILES}
+ ar -rs ${PROGRAM}lib.a ${OBJECT_FILES}
+diff --git a/configure.c b/configure.c
+index d63cdd7..776defe 100644
+--- a/configure.c
b/configure.c
+@@ -240,7 +240,7 @@ struct supported_gdb_version {
+ "7.6",
+ "GDB_FILES=${GDB_7.6_FILES}",
+ "GDB_OFILES=${GDB_7.6_OFILES}",
+- "GDB_PATCH_FILES=gdb-7.6.patch gdb-7.6-ppc64le-support.patch",
++ "GDB_PATCH_FILES=gdb-7.6.patch gdb-7.6-ppc64le-support.patch
gdb-7.6-proc_service.h.patch",
+ "GDB_FLAGS=-DGDB_7_6",
+ "GPLv3"
+ },
+diff --git a/gdb-7.6-proc_service.h.patch b/gdb-7.6-proc_service.h.patch
+new file mode 100644
+index 000..49d18bb
+--- /dev/null
b/gdb-7.6-proc_service.h.patch
+@@ -0,0 +1,55 @@
++--- gdb-7.6/gdb/gdb_proc_service.h.orig
+ gdb-7.6/gdb/gdb_proc_service.h
++@@ -115,7 +115,7 @@ extern pid_t ps_getpid (struct ps_procha
++ /* Fetch the special per-thread address associated with the given LWP.
++This call is only used on a few platforms (most use a normal register).
++The meaning of the `int' parameter is machine-dependent. */
++-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
+++extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
++ lwpid_t, int, psaddr_t *);
++
++
++--- gdb-7.6/gdb/amd64-linux-nat.c.orig
+ gdb-7.6/gdb/amd64-linux-nat.c
++@@ -493,7 +493,7 @@ amd64_linux_new_fork (struct lwp_info *p
++a request for a thread's local storage address. */
++
++ ps_err_e
++-ps_get_thread_area (const struct ps_prochandle *ph,
+++ps_get_thread_area (struct ps_prochandle *ph,
++ lwpid_t lwpid, int idx, void **base)
++ {
++ if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32)
++--- gdb-7.6/gdb/aarch64-linux-nat.c.orig
+ gdb-7.6/gdb/aarch64-linux-nat.c
++@@ -750,7 +750,7 @@ aarch64_linux_new_fork (struct lwp_info
++storage (or its descriptor). */
++
++ ps_err_e
++-ps_get_thread_area (const struct ps_prochandle *ph,
+++ps_get_thread_area (struct ps_prochandle *ph,
++ lwpid_t lwpid, i
[oe] [PATCH][meta-webserver] xdebug: 2.2.6 -> 2.5.1
Upgrade the xdebug to fix the build failure with php 7.1
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../recipes-php/xdebug/{xdebug_2.2.6.bb => xdebug_2.5.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-webserver/recipes-php/xdebug/{xdebug_2.2.6.bb => xdebug_2.5.1.bb}
(85%)
diff --git a/meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb
b/meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb
similarity index 85%
rename from meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb
rename to meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb
index 1ecac88..e2a1fb4 100644
--- a/meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb
+++ b/meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb
@@ -6,8 +6,8 @@ DEPENDS = "php"
SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz;
-SRC_URI[md5sum] = "f216356861e27284580d0208060ea7fa"
-SRC_URI[sha256sum] =
"6dd1cba0605e75009331aa3625a19ef49ade5a75aa9fe2ff8a818108d2cce84e"
+SRC_URI[md5sum] = "6167b1e104f1108d77f08eb561a12b22"
+SRC_URI[sha256sum] =
"7fda9020fd5a2c549ae5a692fcabbb00f74e39dda81d53d25e622bdab4880ec2"
inherit autotools
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe] php: fix install failure
After switch to RSS(recipe specific sysroot), the php package failed when
installing.
This is because the build system can't find the file: pear.conf, that file
stay in "${D}/${STAGING_DIR_NATIVE}" directory before the switch, now stay
in "${RECIPE_SYSROOT_NATIVE}" directory, so we need to place it in correct
place.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-devtools/php/php.inc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index c4fb1d9..b4ce2e3 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -136,9 +136,9 @@ do_install_prepend_class-target() {
# fixme
do_install_append_class-target() {
-install -d ${D}/${sysconfdir}/
-if [ -d ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ];then
- mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir}/* ${D}/${sysconfdir}/
+install -d ${D}${sysconfdir}/
+if [ -d ${RECIPE_SYSROOT_NATIVE}${sysconfdir} ];then
+ install -m 0644 ${RECIPE_SYSROOT_NATIVE}${sysconfdir}/pear.conf
${D}${sysconfdir}/
fi
rm -rf ${D}/${TMPDIR}
rm -rf ${D}/.registry
@@ -146,7 +146,7 @@ do_install_append_class-target() {
rm -rf ${D}/.[a-z]*
rm -rf ${D}/var
rm -f ${D}/${sysconfdir}/php-fpm.conf.default
-sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf
+sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}${sysconfdir}/pear.conf
install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf
install -d ${D}/${sysconfdir}/apache2/conf.d
install -m 0644 ${WORKDIR}/php-fpm-apache.conf
${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf
--
2.8.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] lvm2: 2.02.138 -> 2.02.166
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-support/lvm2/lvm2.inc | 12 +-
...01-implement-libc-specific-_reopen_stream.patch | 139 -
...001-implement-libc-specific-reopen_stream.patch | 80
...002-Guard-use-of-mallinfo-with-__GLIBC__.patch} | 19 +--
..._MUTEX_RECURSIVE-instead-of-PTHREAD_MUTEX.patch | 44 ---
...ntl.h-for-O_-defines-and-fcntl-signature.patch} | 15 +--
...004-tweak-MODPROBE_CMD-for-cross-compile.patch} | 22 ++--
meta-oe/recipes-support/lvm2/lvm2_2.02.166.bb | 6 +
8 files changed, 120 insertions(+), 217 deletions(-)
delete mode 100644
meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-_reopen_stream.patch
create mode 100644
meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch
rename
meta-oe/recipes-support/lvm2/lvm2/{0003-Guard-use-of-mallinfo-with-__GLIBC__.patch
=> 0002-Guard-use-of-mallinfo-with-__GLIBC__.patch} (53%)
delete mode 100644
meta-oe/recipes-support/lvm2/lvm2/0002-use-PTHREAD_MUTEX_RECURSIVE-instead-of-PTHREAD_MUTEX.patch
rename
meta-oe/recipes-support/lvm2/lvm2/{0004-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch
=> 0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch} (64%)
rename
meta-oe/recipes-support/lvm2/lvm2/{0005-tweak-MODPROBE_CMD-for-cross-compile.patch
=> 0004-tweak-MODPROBE_CMD-for-cross-compile.patch} (70%)
create mode 100644 meta-oe/recipes-support/lvm2/lvm2_2.02.166.bb
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc
b/meta-oe/recipes-support/lvm2/lvm2.inc
index 74b7211..7bd26c0 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -2,18 +2,16 @@ SECTION = "utils"
DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
DEPENDS = "udev"
LICENSE = "GPLv2 & LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \
file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24"
SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \
file://lvm.conf \
- file://0001-implement-libc-specific-_reopen_stream.patch \
-
file://0002-use-PTHREAD_MUTEX_RECURSIVE-instead-of-PTHREAD_MUTEX.patch \
- file://0003-Guard-use-of-mallinfo-with-__GLIBC__.patch \
-
file://0004-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \
- file://0005-tweak-MODPROBE_CMD-for-cross-compile.patch \
+ file://0001-implement-libc-specific-reopen_stream.patch \
+ file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \
+
file://0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \
+ file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \
"
-
S = "${WORKDIR}/LVM2.${PV}"
inherit autotools-brokensep pkgconfig systemd
diff --git
a/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-_reopen_stream.patch
b/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-_reopen_stream.patch
deleted file mode 100644
index f0b4e71..000
---
a/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-_reopen_stream.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 089c9c701a1b68b721f479dfc0c58c35b9dd4175 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.k...@gmail.com>
-Date: Wed, 20 Jan 2016 04:39:53 +
-Subject: [PATCH 1/4] implement libc specific _reopen_stream
-
-musl defines stdin/stdio/stderr as constant types which means
-we can not assign to them as we are doing here but works ok with glibc
-therefore abstract out the _reopen_stream definition depending upon if
-we are using glibc or otherwise
-
-Origin:
-http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch
-
-Signed-off-by: Khem Raj <raj.k...@gmail.com>
-Upstream-Status: Pending
-
- lib/commands/toolcontext.c | 22 +++---
- tools/lvmcmdline.c | 6 +++---
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
-index a2f21b8..7f796e4 100644
a/lib/commands/toolcontext.c
-+++ b/lib/commands/toolcontext.c
-@@ -1637,7 +1637,10 @@ static void _init_globals(struct cmd_context *cmd)
- /*
- * Close and reopen stream on file descriptor fd.
- */
--static int _reopen_stream(FILE *stream, int fd, const char *mode, const char
*name, FILE **new_stream)
-+#ifdef __GLIBC__
-+#define _reopen_stream(stream, fd, mode, name) __reopen_stream(stream, fd,
mode, name, )
-+
-+static int __reopen_stream(FILE *stream, int fd, const char *mode, const char
*name, FILE **new_stream)
- {
- int fd_copy, new_fd;
-
-@@ -1664,6 +1667,9 @@ static int _reopen_stream(FILE *stream, int fd, const
char *mode, const char *na
-
- re
[oe] [meta-python][PATCH V2] python-pyserial: remove serialjava.py
The serialjava.py depends on jpython, we don't support jpython now.So remove it.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-python/recipes-devtools/python/python-pyserial.inc | 8
1 file changed, 8 insertions(+)
diff --git a/meta-python/recipes-devtools/python/python-pyserial.inc
b/meta-python/recipes-devtools/python/python-pyserial.inc
index a4c7728..61f3776 100644
--- a/meta-python/recipes-devtools/python/python-pyserial.inc
+++ b/meta-python/recipes-devtools/python/python-pyserial.inc
@@ -14,3 +14,11 @@ SRC_URI[md5sum] = "2f72100de3e410b36d575e12e82e9d27"
SRC_URI[sha256sum] =
"d657051249ce3cbd0446bcfb2be07a435e1029da4d63f53ed9b4cdde7373364c"
inherit pypi
+
+do_install_append() {
+ # We don't support jpython now.
+ if [ -e ${D}${PYTHON_SITEPACKAGES_DIR}/serial/serialjava.py ]; then
+ rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/serial/serialjava.py
+ rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/serial/serialjava.pyc
+ fi
+}
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] python-pyserial: remove serialjava.py
The serialjava.py depends on jpython, we don't support jpython now.So remove it.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-python/recipes-devtools/python/python-pyserial.inc | 8
1 file changed, 8 insertions(+)
diff --git a/meta-python/recipes-devtools/python/python-pyserial.inc
b/meta-python/recipes-devtools/python/python-pyserial.inc
index a4c7728..61f3776 100644
--- a/meta-python/recipes-devtools/python/python-pyserial.inc
+++ b/meta-python/recipes-devtools/python/python-pyserial.inc
@@ -14,3 +14,11 @@ SRC_URI[md5sum] = "2f72100de3e410b36d575e12e82e9d27"
SRC_URI[sha256sum] =
"d657051249ce3cbd0446bcfb2be07a435e1029da4d63f53ed9b4cdde7373364c"
inherit pypi
+
+do_install_append() {
+ # We don't support jpython now.
+ if [ -e ${D}${PYTHON_SITEPACKAGES_DIR}/serial/serialjava.py ]; then
+ rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/serial/serialjava.py
+ rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/serial/serialjava.pyc
+ fi
+}
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] augeas: fix QA warning
Add PACKAGECONFIG for libselinux.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-support/augeas/augeas.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-oe/recipes-support/augeas/augeas.inc
b/meta-oe/recipes-support/augeas/augeas.inc
index 354b180..185abae 100644
--- a/meta-oe/recipes-support/augeas/augeas.inc
+++ b/meta-oe/recipes-support/augeas/augeas.inc
@@ -28,3 +28,6 @@ LEAD_SONAME = "libaugeas.so"
do_install_append() {
rm -fr ${D}${datadir}/vim
}
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[libselinux] = "--with-selinux,--without-selinux,libselinux"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] fix QA Issue for opensaf
Move the do_sysvinit_install contents to do_install_append.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb
b/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb
index da9c105..6ceb225 100644
--- a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb
+++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb
@@ -53,6 +53,11 @@ do_install_append() {
install -m 0644
${B}/osaf/services/infrastructure/nid/config/opensafd.service \
${D}${systemd_unitdir}/system
install -m 0644 ${B}/contrib/plmc/config/*.service
${D}/${systemd_unitdir}/system
+
+if [ ! -d "${D}${sysconfdir}/init.d" ]; then
+install -d ${D}${sysconfdir}/init.d
+install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd
${D}${sysconfdir}/init.d/
+fi
}
FILES_${PN} += "${localstatedir}/run ${systemd_unitdir}/system/*.service"
@@ -62,12 +67,3 @@ INSANE_SKIP_${PN} = "dev-so"
RDEPENDS_${PN} += "bash python"
-do_sysvinit_install() {
-if [ ! -d "${D}${sysconfdir}/init.d" ]; then
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd
${D}${sysconfdir}/init.d/
-fi
-}
-
-addtask sysvinit_install after do_install before do_package
-
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH V3] sdparm: 1.09 -> 1.10
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../recipes-support/sdparm/files/make-sysroot-work.patch | 14 +-
.../sdparm/{sdparm_1.09.bb => sdparm_1.10.bb} | 4 ++--
2 files changed, 11 insertions(+), 7 deletions(-)
rename meta-oe/recipes-support/sdparm/{sdparm_1.09.bb => sdparm_1.10.bb} (83%)
diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
index 5405ed8..3fd85d9 100644
--- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
+++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
@@ -1,27 +1,31 @@
-[PATCH] make sysroot work
+From 15f0722bc5481cca5ba92adceab8c769112e4ea6 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Mon, 24 Oct 2016 07:28:13 +
+Subject: [PATCH] sdparm: make sysroot work
Upstream-Status: Pending
Add = before the included dir to make sysroot work
Signed-off-by: Roy.Li <rongqing...@windriver.com>
+Signed-off-by: Dengke Du <dengke...@windriver.com>
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index c83788c..9f62115 100644
+index 61dd9f8..42c911f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -32,7 +32,7 @@ sglib_SOURCES = ../lib/sg_lib.c \
+@@ -41,7 +41,7 @@ sglib_SOURCES = ../lib/sg_lib.c \
../lib/sg_pt_common.c
if HAVE_SGUTILS
--INCLUDES = -I/usr/include/scsi
+-INCLUDES = -I/scsi
+INCLUDES = -I=@includedir@/scsi
sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
sdparm_DEPENDENCIES = @GETOPT_O_FILES@
else
--
-1.9.1
+2.7.4
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
similarity index 83%
rename from meta-oe/recipes-support/sdparm/sdparm_1.09.bb
rename to meta-oe/recipes-support/sdparm/sdparm_1.10.bb
index ca11ca4..8ab2819 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
PACKAGES =+ "${PN}-scripts"
RDEPENDS_${PN}-scripts += "bash ${PN}"
-SRC_URI[md5sum] = "e51b1fd41c3e4c9d1274a2e4f046eebf"
-SRC_URI[sha256sum] =
"7294f44173ac0946f1de8af02b1bdb0bd648079245396589397a2b0d3abc42d3"
+SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f"
+SRC_URI[sha256sum] =
"1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3"
inherit autotools
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH V2] sdparm: 1.09 -> 1.10
Please ignore this.
// Dengke
On 2016年10月25日 16:45, Dengke Du wrote:
Changed in V2:
Add the [meta-oe] prefix in patch.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../recipes-support/sdparm/files/make-sysroot-work.patch | 14 +-
.../sdparm/{sdparm_1.09.bb => sdparm_1.10.bb} | 4 ++--
2 files changed, 11 insertions(+), 7 deletions(-)
rename meta-oe/recipes-support/sdparm/{sdparm_1.09.bb => sdparm_1.10.bb} (83%)
diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
index 5405ed8..3fd85d9 100644
--- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
+++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
@@ -1,27 +1,31 @@
-[PATCH] make sysroot work
+From 15f0722bc5481cca5ba92adceab8c769112e4ea6 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Mon, 24 Oct 2016 07:28:13 +
+Subject: [PATCH] sdparm: make sysroot work
Upstream-Status: Pending
Add = before the included dir to make sysroot work
Signed-off-by: Roy.Li <rongqing...@windriver.com>
+Signed-off-by: Dengke Du <dengke...@windriver.com>
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index c83788c..9f62115 100644
+index 61dd9f8..42c911f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -32,7 +32,7 @@ sglib_SOURCES = ../lib/sg_lib.c \
+@@ -41,7 +41,7 @@ sglib_SOURCES = ../lib/sg_lib.c \
../lib/sg_pt_common.c
if HAVE_SGUTILS
--INCLUDES = -I/usr/include/scsi
+-INCLUDES = -I/scsi
+INCLUDES = -I=@includedir@/scsi
sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
sdparm_DEPENDENCIES = @GETOPT_O_FILES@
else
--
-1.9.1
+2.7.4
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
similarity index 83%
rename from meta-oe/recipes-support/sdparm/sdparm_1.09.bb
rename to meta-oe/recipes-support/sdparm/sdparm_1.10.bb
index ca11ca4..8ab2819 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
PACKAGES =+ "${PN}-scripts"
RDEPENDS_${PN}-scripts += "bash ${PN}"
-SRC_URI[md5sum] = "e51b1fd41c3e4c9d1274a2e4f046eebf"
-SRC_URI[sha256sum] =
"7294f44173ac0946f1de8af02b1bdb0bd648079245396589397a2b0d3abc42d3"
+SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f"
+SRC_URI[sha256sum] =
"1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3"
inherit autotools
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] sdparm: 1.09 -> 1.10
OK, thanks for reminding, I will send V2.
// Dengke
On 2016年10月25日 16:28, Robert Yang wrote:
Missing [meta-oe] in subject line, see:
propriate prefix so that it is clear which layer the patch is intended
to be applied to:
// Robert
On 10/25/2016 12:47 PM, Dengke Du wrote:
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../sdparm/files/make-sysroot-work.patch | 14 -
meta-oe/recipes-support/sdparm/sdparm_1.09.bb | 23
--
meta-oe/recipes-support/sdparm/sdparm_1.10.bb | 23
++
3 files changed, 32 insertions(+), 28 deletions(-)
delete mode 100644 meta-oe/recipes-support/sdparm/sdparm_1.09.bb
create mode 100644 meta-oe/recipes-support/sdparm/sdparm_1.10.bb
diff --git
a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
index 5405ed8..3fd85d9 100644
--- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
+++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
@@ -1,27 +1,31 @@
-[PATCH] make sysroot work
+From 15f0722bc5481cca5ba92adceab8c769112e4ea6 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Mon, 24 Oct 2016 07:28:13 +
+Subject: [PATCH] sdparm: make sysroot work
Upstream-Status: Pending
Add = before the included dir to make sysroot work
Signed-off-by: Roy.Li <rongqing...@windriver.com>
+Signed-off-by: Dengke Du <dengke...@windriver.com>
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index c83788c..9f62115 100644
+index 61dd9f8..42c911f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -32,7 +32,7 @@ sglib_SOURCES =../lib/sg_lib.c \
+@@ -41,7 +41,7 @@ sglib_SOURCES =../lib/sg_lib.c \
../lib/sg_pt_common.c
if HAVE_SGUTILS
--INCLUDES = -I/usr/include/scsi
+-INCLUDES = -I/scsi
+INCLUDES = -I=@includedir@/scsi
sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
sdparm_DEPENDENCIES = @GETOPT_O_FILES@
else
--
-1.9.1
+2.7.4
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
b/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
deleted file mode 100644
index ca11ca4..000
--- a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "fetch and change SCSI mode pages"
-DESCRIPTION = "The sdparm utility accesses and optionally modifies \
-SCSI devices' mode page and inquiry data."
-HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html;
-SECTION = "console/utils"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM =
"file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \
- file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed"
-DEPENDS="sg3-utils"
-SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
- file://make-sysroot-work.patch \
- "
-
-PACKAGES =+ "${PN}-scripts"
-RDEPENDS_${PN}-scripts += "bash ${PN}"
-
-SRC_URI[md5sum] = "e51b1fd41c3e4c9d1274a2e4f046eebf"
-SRC_URI[sha256sum] =
"7294f44173ac0946f1de8af02b1bdb0bd648079245396589397a2b0d3abc42d3"
-
-inherit autotools
-
-# Put the bash scripts to ${PN}-scripts
-FILES_${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp"
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
new file mode 100644
index 000..8ab2819
--- /dev/null
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
@@ -0,0 +1,23 @@
+SUMMARY = "fetch and change SCSI mode pages"
+DESCRIPTION = "The sdparm utility accesses and optionally modifies \
+SCSI devices' mode page and inquiry data."
+HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html;
+SECTION = "console/utils"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM =
"file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \
+ file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed"
+DEPENDS="sg3-utils"
+SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
+ file://make-sysroot-work.patch \
+ "
+
+PACKAGES =+ "${PN}-scripts"
+RDEPENDS_${PN}-scripts += "bash ${PN}"
+
+SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f"
+SRC_URI[sha256sum] =
"1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3"
+
+inherit autotools
+
+# Put the bash scripts to ${PN}-scripts
+FILES_${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp"
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH V2] sdparm: 1.09 -> 1.10
Changed in V2:
Add the [meta-oe] prefix in patch.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../recipes-support/sdparm/files/make-sysroot-work.patch | 14 +-
.../sdparm/{sdparm_1.09.bb => sdparm_1.10.bb} | 4 ++--
2 files changed, 11 insertions(+), 7 deletions(-)
rename meta-oe/recipes-support/sdparm/{sdparm_1.09.bb => sdparm_1.10.bb} (83%)
diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
index 5405ed8..3fd85d9 100644
--- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
+++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
@@ -1,27 +1,31 @@
-[PATCH] make sysroot work
+From 15f0722bc5481cca5ba92adceab8c769112e4ea6 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Mon, 24 Oct 2016 07:28:13 +
+Subject: [PATCH] sdparm: make sysroot work
Upstream-Status: Pending
Add = before the included dir to make sysroot work
Signed-off-by: Roy.Li <rongqing...@windriver.com>
+Signed-off-by: Dengke Du <dengke...@windriver.com>
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index c83788c..9f62115 100644
+index 61dd9f8..42c911f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -32,7 +32,7 @@ sglib_SOURCES = ../lib/sg_lib.c \
+@@ -41,7 +41,7 @@ sglib_SOURCES = ../lib/sg_lib.c \
../lib/sg_pt_common.c
if HAVE_SGUTILS
--INCLUDES = -I/usr/include/scsi
+-INCLUDES = -I/scsi
+INCLUDES = -I=@includedir@/scsi
sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
sdparm_DEPENDENCIES = @GETOPT_O_FILES@
else
--
-1.9.1
+2.7.4
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
similarity index 83%
rename from meta-oe/recipes-support/sdparm/sdparm_1.09.bb
rename to meta-oe/recipes-support/sdparm/sdparm_1.10.bb
index ca11ca4..8ab2819 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
PACKAGES =+ "${PN}-scripts"
RDEPENDS_${PN}-scripts += "bash ${PN}"
-SRC_URI[md5sum] = "e51b1fd41c3e4c9d1274a2e4f046eebf"
-SRC_URI[sha256sum] =
"7294f44173ac0946f1de8af02b1bdb0bd648079245396589397a2b0d3abc42d3"
+SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f"
+SRC_URI[sha256sum] =
"1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3"
inherit autotools
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] sdparm: 1.09 -> 1.10
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
.../sdparm/files/make-sysroot-work.patch | 14 -
meta-oe/recipes-support/sdparm/sdparm_1.09.bb | 23 --
meta-oe/recipes-support/sdparm/sdparm_1.10.bb | 23 ++
3 files changed, 32 insertions(+), 28 deletions(-)
delete mode 100644 meta-oe/recipes-support/sdparm/sdparm_1.09.bb
create mode 100644 meta-oe/recipes-support/sdparm/sdparm_1.10.bb
diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
index 5405ed8..3fd85d9 100644
--- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
+++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
@@ -1,27 +1,31 @@
-[PATCH] make sysroot work
+From 15f0722bc5481cca5ba92adceab8c769112e4ea6 Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Mon, 24 Oct 2016 07:28:13 +
+Subject: [PATCH] sdparm: make sysroot work
Upstream-Status: Pending
Add = before the included dir to make sysroot work
Signed-off-by: Roy.Li <rongqing...@windriver.com>
+Signed-off-by: Dengke Du <dengke...@windriver.com>
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index c83788c..9f62115 100644
+index 61dd9f8..42c911f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -32,7 +32,7 @@ sglib_SOURCES = ../lib/sg_lib.c \
+@@ -41,7 +41,7 @@ sglib_SOURCES = ../lib/sg_lib.c \
../lib/sg_pt_common.c
if HAVE_SGUTILS
--INCLUDES = -I/usr/include/scsi
+-INCLUDES = -I/scsi
+INCLUDES = -I=@includedir@/scsi
sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
sdparm_DEPENDENCIES = @GETOPT_O_FILES@
else
--
-1.9.1
+2.7.4
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
b/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
deleted file mode 100644
index ca11ca4..000
--- a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "fetch and change SCSI mode pages"
-DESCRIPTION = "The sdparm utility accesses and optionally modifies \
-SCSI devices' mode page and inquiry data."
-HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html;
-SECTION = "console/utils"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \
-
file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed"
-DEPENDS="sg3-utils"
-SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
- file://make-sysroot-work.patch \
- "
-
-PACKAGES =+ "${PN}-scripts"
-RDEPENDS_${PN}-scripts += "bash ${PN}"
-
-SRC_URI[md5sum] = "e51b1fd41c3e4c9d1274a2e4f046eebf"
-SRC_URI[sha256sum] =
"7294f44173ac0946f1de8af02b1bdb0bd648079245396589397a2b0d3abc42d3"
-
-inherit autotools
-
-# Put the bash scripts to ${PN}-scripts
-FILES_${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp"
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
new file mode 100644
index 000..8ab2819
--- /dev/null
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
@@ -0,0 +1,23 @@
+SUMMARY = "fetch and change SCSI mode pages"
+DESCRIPTION = "The sdparm utility accesses and optionally modifies \
+SCSI devices' mode page and inquiry data."
+HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html;
+SECTION = "console/utils"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \
+
file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed"
+DEPENDS="sg3-utils"
+SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
+ file://make-sysroot-work.patch \
+ "
+
+PACKAGES =+ "${PN}-scripts"
+RDEPENDS_${PN}-scripts += "bash ${PN}"
+
+SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f"
+SRC_URI[sha256sum] =
"1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3"
+
+inherit autotools
+
+# Put the bash scripts to ${PN}-scripts
+FILES_${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH V2] gd: Security Advisory CVE-2016-7568
Changed in V2:
In V1 forgot to add SOB(Singed-off-by) in source code patch.
Backport patch to fix CVE-2016-7568 from gd upstream:
https://github.com/libgd/libgd/commit/2806adfdc27a94d333199345394d7c302952b95f
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
...01-Fix-integer-overflow-in-gdImageWebpCtx.patch | 42 ++
meta-oe/recipes-support/gd/gd_2.2.3.bb | 1 +
2 files changed, 43 insertions(+)
create mode 100644
meta-oe/recipes-support/gd/gd/0001-Fix-integer-overflow-in-gdImageWebpCtx.patch
diff --git
a/meta-oe/recipes-support/gd/gd/0001-Fix-integer-overflow-in-gdImageWebpCtx.patch
b/meta-oe/recipes-support/gd/gd/0001-Fix-integer-overflow-in-gdImageWebpCtx.patch
new file mode 100644
index 000..f74e678
--- /dev/null
+++
b/meta-oe/recipes-support/gd/gd/0001-Fix-integer-overflow-in-gdImageWebpCtx.patch
@@ -0,0 +1,42 @@
+From 2806adfdc27a94d333199345394d7c302952b95f Mon Sep 17 00:00:00 2001
+From: trylab <try...@users.noreply.github.com>
+Date: Tue, 6 Sep 2016 18:35:32 +0800
+Subject: [PATCH] Fix integer overflow in gdImageWebpCtx
+
+Integer overflow can be happened in expression gdImageSX(im) * 4 *
+gdImageSY(im). It could lead to heap buffer overflow in the following
+code. This issue has been reported to the PHP Bug Tracking System. The
+proof-of-concept file will be supplied some days later. This issue was
+discovered by Ke Liu of Tencent's Xuanwu LAB.
+
+Upstream-Status: Backport
+
+CVE-2016-7568
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ src/gd_webp.c | 8
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/gd_webp.c b/src/gd_webp.c
+index 8eb4dee..9886399 100644
+--- a/src/gd_webp.c
b/src/gd_webp.c
+@@ -199,6 +199,14 @@ BGD_DECLARE(void) gdImageWebpCtx (gdImagePtr im, gdIOCtx
* outfile, int quality)
+ quality = 80;
+ }
+
++ if (overflow2(gdImageSX(im), 4)) {
++ return;
++ }
++
++ if (overflow2(gdImageSX(im) * 4, gdImageSY(im))) {
++ return;
++ }
++
+ argb = (uint8_t *)gdMalloc(gdImageSX(im) * 4 * gdImageSY(im));
+ if (!argb) {
+ return;
+--
+2.9.3
+
diff --git a/meta-oe/recipes-support/gd/gd_2.2.3.bb
b/meta-oe/recipes-support/gd/gd_2.2.3.bb
index 9655e9c..f7d4f44 100644
--- a/meta-oe/recipes-support/gd/gd_2.2.3.bb
+++ b/meta-oe/recipes-support/gd/gd_2.2.3.bb
@@ -15,6 +15,7 @@ DEPENDS = "freetype libpng jpeg zlib tiff"
SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \
file://fix-gcc-unused-functions.patch \
file://disable-jpeg_read-test.patch \
+ file://0001-Fix-integer-overflow-in-gdImageWebpCtx.patch \
"
SRCREV = "46ceef5970bf3a847ff61d1bdde7501d66c11d0c"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] gd: Security Advisory CVE-2016-7568
Backport patch to fix CVE-2016-7568 from gd upstream:
https://github.com/libgd/libgd/commit/2806adfdc27a94d333199345394d7c302952b95f
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
...01-Fix-integer-overflow-in-gdImageWebpCtx.patch | 41 ++
meta-oe/recipes-support/gd/gd_2.2.3.bb | 1 +
2 files changed, 42 insertions(+)
create mode 100644
meta-oe/recipes-support/gd/gd/0001-Fix-integer-overflow-in-gdImageWebpCtx.patch
diff --git
a/meta-oe/recipes-support/gd/gd/0001-Fix-integer-overflow-in-gdImageWebpCtx.patch
b/meta-oe/recipes-support/gd/gd/0001-Fix-integer-overflow-in-gdImageWebpCtx.patch
new file mode 100644
index 000..9967e23
--- /dev/null
+++
b/meta-oe/recipes-support/gd/gd/0001-Fix-integer-overflow-in-gdImageWebpCtx.patch
@@ -0,0 +1,41 @@
+From 2806adfdc27a94d333199345394d7c302952b95f Mon Sep 17 00:00:00 2001
+From: trylab <try...@users.noreply.github.com>
+Date: Tue, 6 Sep 2016 18:35:32 +0800
+Subject: [PATCH] Fix integer overflow in gdImageWebpCtx
+
+Integer overflow can be happened in expression gdImageSX(im) * 4 *
+gdImageSY(im). It could lead to heap buffer overflow in the following
+code. This issue has been reported to the PHP Bug Tracking System. The
+proof-of-concept file will be supplied some days later. This issue was
+discovered by Ke Liu of Tencent's Xuanwu LAB.
+
+Upstream-Status: Backport
+
+CVE-2016-7568
+
+---
+ src/gd_webp.c | 8
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/gd_webp.c b/src/gd_webp.c
+index 8eb4dee..9886399 100644
+--- a/src/gd_webp.c
b/src/gd_webp.c
+@@ -199,6 +199,14 @@ BGD_DECLARE(void) gdImageWebpCtx (gdImagePtr im, gdIOCtx
* outfile, int quality)
+ quality = 80;
+ }
+
++ if (overflow2(gdImageSX(im), 4)) {
++ return;
++ }
++
++ if (overflow2(gdImageSX(im) * 4, gdImageSY(im))) {
++ return;
++ }
++
+ argb = (uint8_t *)gdMalloc(gdImageSX(im) * 4 * gdImageSY(im));
+ if (!argb) {
+ return;
+--
+2.9.3
+
diff --git a/meta-oe/recipes-support/gd/gd_2.2.3.bb
b/meta-oe/recipes-support/gd/gd_2.2.3.bb
index 9655e9c..f7d4f44 100644
--- a/meta-oe/recipes-support/gd/gd_2.2.3.bb
+++ b/meta-oe/recipes-support/gd/gd_2.2.3.bb
@@ -15,6 +15,7 @@ DEPENDS = "freetype libpng jpeg zlib tiff"
SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \
file://fix-gcc-unused-functions.patch \
file://disable-jpeg_read-test.patch \
+ file://0001-Fix-integer-overflow-in-gdImageWebpCtx.patch \
"
SRCREV = "46ceef5970bf3a847ff61d1bdde7501d66c11d0c"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] linux-atm: fix do_compile error
Issue: LIN9-1688
With linux kernel v4.8, for file ./src/maint/zntune.c, glibc time.h is
included before linux time.h, when compile zntune.c, it break down by
the following errors:
redefinition of 'struct timespec' 'struct timeval'
'struct timezone' 'struct itimerval'
We should exclude the linux time.h by disable linux/atm_zatm.h and move
some useful definition in linux/atm_zatm.h to a new header file in linux-atm
source code to resolve it.
(LOCAL REV: NOT UPSTREAM) -- will sent to oe-devel 20161019
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
...-fix-compile-error-with-linux-kernel-v4.8.patch | 74 ++
.../recipes-support/linux-atm/linux-atm_2.5.2.bb | 4 +-
2 files changed, 77 insertions(+), 1 deletion(-)
create mode 100644
meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch
diff --git
a/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch
b/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch
new file mode 100644
index 000..583a6ca
--- /dev/null
+++
b/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch
@@ -0,0 +1,74 @@
+From 7cdafc0dee8054f82777ed3bf6d4c8b5582d09ad Mon Sep 17 00:00:00 2001
+From: Dengke Du <dengke...@windriver.com>
+Date: Tue, 18 Oct 2016 07:56:02 +
+Subject: [PATCH] fix compile error with linux kernel v4.8
+
+In src/maint/zntune.c, the glibc time.h is included before linux
+time.h, so when compile the zntune.c, it break down by errors:
+
+ redefinition of 'struct timespec' 'struct timeval'
+ 'struct timezone' 'struct itimerval'
+
+We should exclude the linux time.h by disable linux/atm_zatm.h and
+move some useful definition in linux/atm_zatm.h to zntune.c to resolve
+it.
+
+Upstream-status: Pending
+
+Signed-off-by: Dengke Du <dengke...@windriver.com>
+---
+ src/include/atm_zatm.h | 26 ++
+ src/maint/zntune.c | 3 +--
+ 2 files changed, 27 insertions(+), 2 deletions(-)
+ create mode 100644 src/include/atm_zatm.h
+
+diff --git a/src/include/atm_zatm.h b/src/include/atm_zatm.h
+new file mode 100644
+index 000..7d64f4d
+--- /dev/null
b/src/include/atm_zatm.h
+@@ -0,0 +1,26 @@
++#include
++#include
++
++#define ZATM_GETPOOL_IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
++/* get pool statistics */
++#define ZATM_GETPOOLZ _IOW('a',ATMIOC_SARPRV+2,struct atmif_sioc)
++/* get statistics and zero */
++#define ZATM_SETPOOL_IOW('a',ATMIOC_SARPRV+3,struct atmif_sioc)
++
++struct zatm_pool_info {
++int ref_count; /* free buffer pool usage counters */
++int low_water,high_water; /* refill parameters */
++int rqa_count,rqu_count;/* queue condition counters */
++int offset,next_off;/* alignment optimizations: offset */
++int next_cnt,next_thres;/* repetition counter and threshold */
++};/* set pool parameters */
++
++struct zatm_pool_req {
++int pool_num; /* pool number */
++struct zatm_pool_info info; /* actual information */
++};
++
++#define ZATM_OAM_POOL 0 /* free buffer pool for OAM cells */
++#define ZATM_AAL0_POOL 1 /* free buffer pool for AAL0 cells */
++#define ZATM_AAL5_POOL_BASE 2 /* first AAL5 free buffer pool */
++#define ZATM_LAST_POOL ZATM_AAL5_POOL_BASE+10 /* max. 64 kB */
+diff --git a/src/maint/zntune.c b/src/maint/zntune.c
+index 62d62ab..bb93eab 100644
+--- a/src/maint/zntune.c
b/src/maint/zntune.c
+@@ -13,9 +13,8 @@
+ #include
+ #include
+ #include
++#include
+ #include /* for struct timeval, although it's not used */
+-#include
+-
+
+ static void usage(const char *name)
+ {
+--
+2.9.0
+
diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
index edfb045..6ab8b07 100644
--- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
+++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
@@ -9,7 +9,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
SRC_URI =
"http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz
\
file://link-with-ldflags.patch \
- file://install-from-buildir.patch"
+ file://install-from-buildir.patch \
+ file://0001-fix-compile-error-with-linux-kernel-v4.8.patch \
+"
SRC_URI[md5sum] = "d49499368c3cf15f73a05d9bce8824a8"
SRC_URI[sha256sum] =
"9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a"
--
2.7.4
--
___
[oe] [PATCH] libndp: 1.5 -> 1.6
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-connectivity/libndp/libndp_1.5.bb | 10 --
meta-oe/recipes-connectivity/libndp/libndp_1.6.bb | 10 ++
2 files changed, 10 insertions(+), 10 deletions(-)
delete mode 100644 meta-oe/recipes-connectivity/libndp/libndp_1.5.bb
create mode 100644 meta-oe/recipes-connectivity/libndp/libndp_1.6.bb
diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.5.bb
b/meta-oe/recipes-connectivity/libndp/libndp_1.5.bb
deleted file mode 100644
index 8f1d1ff..000
--- a/meta-oe/recipes-connectivity/libndp/libndp_1.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SUMMARY = "Library for IPv6 Neighbor Discovery Protocol"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI = "http://libndp.org/files/${BPN}-${PV}.tar.gz;
-SRC_URI[md5sum] = "beb82e8d75d8382d1b7c0bb0f68be429"
-SRC_URI[sha256sum] =
"faf116ab70ce9514ec4e8573556025debea08f606e7f38b616de1f26e120c795"
-
-inherit autotools
diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb
b/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb
new file mode 100644
index 000..a35dff8
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Library for IPv6 Neighbor Discovery Protocol"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI = "http://libndp.org/files/${BPN}-${PV}.tar.gz;
+SRC_URI[md5sum] = "1e54d26bcb4a4110bc3f90c5dd04f1a7"
+SRC_URI[sha256sum] =
"0c7dfa84e013bd5e569ef2c6292a6f72cfaf14f4ff77a77425e52edc33ffac0e"
+
+inherit autotools
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH V2] edac-utils: add systemd support and required dependencies for edac
Changed in V2:
Change the title to eliminate confused.
Add systemd unit files for edac-utils.
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-support/edac-utils/edac-utils_git.bb | 14 +-
meta-oe/recipes-support/edac-utils/files/edac.service | 11 +++
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/edac-utils/files/edac.service
diff --git a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
index c0ad665..b3ff1cc 100644
--- a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
+++ b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
@@ -14,9 +14,10 @@ S = "${WORKDIR}/git"
SRC_URI = "git://github.com/grondo/edac-utils \
file://make-init-script-be-able-to-automatically-load-EDAC-.patch \
file://add-restart-to-initscript.patch \
+file://edac.service \
"
-inherit autotools-brokensep
+inherit autotools-brokensep systemd
do_configure_prepend () {
touch ${S}/ChangeLog
@@ -31,4 +32,15 @@ RDEPENDS_${PN}_powerpc = "dmidecode"
RDEPENDS_${PN}_powerpc64 = "dmidecode"
RDEPENDS_${PN}_append = " \
perl-module-file-basename perl-module-file-find perl-module-getopt-long
perl-module-posix \
+perl-module-overload \
+perl-module-overloading \
+perl-module-file-glob \
"
+
+do_install_append() {
+ install -d ${D}${systemd_unitdir}/system
+ install -m 644 ${WORKDIR}/edac.service ${D}/${systemd_unitdir}/system
+ sed -i -e 's,@SBINDIR@,${sbindir},g'
${D}/${systemd_unitdir}/system/edac.service
+}
+
+SYSTEMD_SERVICE_${PN} = "edac.service"
diff --git a/meta-oe/recipes-support/edac-utils/files/edac.service
b/meta-oe/recipes-support/edac-utils/files/edac.service
new file mode 100644
index 000..9f687a8
--- /dev/null
+++ b/meta-oe/recipes-support/edac-utils/files/edac.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Initialize EDAC Drivers For Machine Hardware
+
+[Service]
+Type=oneshot
+ExecStart=@SBINDIR@/edac-ctl --register-labels
+ExecStop=@SBINDIR@/edac-ctl --unload
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] edac-utils: add systemd init script for edac
Please ignore!
Thanks
//Dengke
On 2016年09月28日 15:44, Dengke Du wrote:
In order to add the systemd init script for edac, we need to add
some perl module to make sure the correct startup.
(LOCAL REV: NOT UPSTREAM) -- Send to meta-openembedded 20160928
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-support/edac-utils/edac-utils_git.bb | 14 +-
meta-oe/recipes-support/edac-utils/files/edac.service | 11 +++
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/edac-utils/files/edac.service
diff --git a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
index c0ad665..b3ff1cc 100644
--- a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
+++ b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
@@ -14,9 +14,10 @@ S = "${WORKDIR}/git"
SRC_URI = "git://github.com/grondo/edac-utils \
file://make-init-script-be-able-to-automatically-load-EDAC-.patch \
file://add-restart-to-initscript.patch \
+file://edac.service \
"
-inherit autotools-brokensep
+inherit autotools-brokensep systemd
do_configure_prepend () {
touch ${S}/ChangeLog
@@ -31,4 +32,15 @@ RDEPENDS_${PN}_powerpc = "dmidecode"
RDEPENDS_${PN}_powerpc64 = "dmidecode"
RDEPENDS_${PN}_append = " \
perl-module-file-basename perl-module-file-find perl-module-getopt-long
perl-module-posix \
+perl-module-overload \
+perl-module-overloading \
+perl-module-file-glob \
"
+
+do_install_append() {
+ install -d ${D}${systemd_unitdir}/system
+ install -m 644 ${WORKDIR}/edac.service ${D}/${systemd_unitdir}/system
+ sed -i -e 's,@SBINDIR@,${sbindir},g'
${D}/${systemd_unitdir}/system/edac.service
+}
+
+SYSTEMD_SERVICE_${PN} = "edac.service"
diff --git a/meta-oe/recipes-support/edac-utils/files/edac.service
b/meta-oe/recipes-support/edac-utils/files/edac.service
new file mode 100644
index 000..9f687a8
--- /dev/null
+++ b/meta-oe/recipes-support/edac-utils/files/edac.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Initialize EDAC Drivers For Machine Hardware
+
+[Service]
+Type=oneshot
+ExecStart=@SBINDIR@/edac-ctl --register-labels
+ExecStop=@SBINDIR@/edac-ctl --unload
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] edac-utils: add systemd init script for edac
In order to add the systemd init script for edac, we need to add
some perl module to make sure the correct startup.
(LOCAL REV: NOT UPSTREAM) -- Send to meta-openembedded 20160928
Signed-off-by: Dengke Du <dengke...@windriver.com>
---
meta-oe/recipes-support/edac-utils/edac-utils_git.bb | 14 +-
meta-oe/recipes-support/edac-utils/files/edac.service | 11 +++
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/edac-utils/files/edac.service
diff --git a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
index c0ad665..b3ff1cc 100644
--- a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
+++ b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
@@ -14,9 +14,10 @@ S = "${WORKDIR}/git"
SRC_URI = "git://github.com/grondo/edac-utils \
file://make-init-script-be-able-to-automatically-load-EDAC-.patch \
file://add-restart-to-initscript.patch \
+file://edac.service \
"
-inherit autotools-brokensep
+inherit autotools-brokensep systemd
do_configure_prepend () {
touch ${S}/ChangeLog
@@ -31,4 +32,15 @@ RDEPENDS_${PN}_powerpc = "dmidecode"
RDEPENDS_${PN}_powerpc64 = "dmidecode"
RDEPENDS_${PN}_append = " \
perl-module-file-basename perl-module-file-find perl-module-getopt-long
perl-module-posix \
+perl-module-overload \
+perl-module-overloading \
+perl-module-file-glob \
"
+
+do_install_append() {
+ install -d ${D}${systemd_unitdir}/system
+ install -m 644 ${WORKDIR}/edac.service ${D}/${systemd_unitdir}/system
+ sed -i -e 's,@SBINDIR@,${sbindir},g'
${D}/${systemd_unitdir}/system/edac.service
+}
+
+SYSTEMD_SERVICE_${PN} = "edac.service"
diff --git a/meta-oe/recipes-support/edac-utils/files/edac.service
b/meta-oe/recipes-support/edac-utils/files/edac.service
new file mode 100644
index 000..9f687a8
--- /dev/null
+++ b/meta-oe/recipes-support/edac-utils/files/edac.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Initialize EDAC Drivers For Machine Hardware
+
+[Service]
+Type=oneshot
+ExecStart=@SBINDIR@/edac-ctl --register-labels
+ExecStop=@SBINDIR@/edac-ctl --unload
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
