Skip to contentSkip to conversation

Update bind and replace dhcp

PATCH In review akuster 3 participants 10 messages Jun 22, 2020 – Jun 26, 2020

lore
Share & tools
lore

akuster

author
#0 lore raw

cover Update bind and replace dhcp

Move to the latest Bind ESV and replace the depricated dhcp with kea. Three packages need to move from meta-oe to core.

The new bind is not compatable with the dhcp

Armin Kuster (6):
libuv: move from meta-oe to core for bind update
bind: Update to latest ESV version 9.16
log4cplus: move meta-oe pkg to core
kea: Move to core
dhcp: remove depricated package maintainers.inc: add new packages remove dhcp

 meta/conf/distro/include/maintainers.inc      |   4 +-
 ....in-remove-useless-L-use_openssl-lib.patch |  30 ----
 ...d-V-and-start-log-hide-build-options.patch |  33 ++--
 ...ching-for-json-headers-searches-sysr.patch |  14 +-
 .../bind/{bind_9.11.19.bb => bind_9.16.4.bb}  |  37 ++---
 meta/recipes-connectivity/dhcp/dhcp.inc       | 149 ------------------
 ...TH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  27 ----
 ...-limitation-in-linux-dhclient-script.patch |  65 --------
 .../dhcp/dhcp/0002-dhclient-dbus.patch        | 117 --------------
 .../dhcp/dhcp/0003-link-with-lcrypto.patch    |  35 ----
 .../dhcp/0004-Fix-out-of-tree-builds.patch    |  95 -----------
 ...invoke-dhclient-script-failed-on-Rea.patch |  36 -----
 ...gument-to-make-the-libxml2-dependenc.patch |  62 --------
 ...move-dhclient-script-bash-dependency.patch |  28 ----
 ...ct-the-intention-for-xml2-lib-search.patch |  34 ----
 .../dhcp/dhcp/0013-fixup_use_libbind.patch    |  64 --------
 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb  |  21 ---
 .../kea/files/0001-remove-AC_TRY_RUN.patch    |  34 ++++
 .../kea/files/kea-dhcp-ddns.service           |  13 ++
 .../kea/files/kea-dhcp4.service               |  13 ++
 .../kea/files/kea-dhcp6.service               |  13 ++
 meta/recipes-connectivity/kea/kea_1.7.7.bb    |  67 ++++++++
 .../libuv/libuv_1.34.2.bb                     |  19 +++
 .../log4cplus/log4cplus_2.0.5.bb              |  19 +++
 24 files changed, 216 insertions(+), 813 deletions(-)
 delete mode 100644 meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch
 rename meta/recipes-connectivity/bind/{bind_9.11.19.bb => bind_9.16.4.bb} (77%)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp.inc
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb
 create mode 100644 meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch
 create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service
 create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp4.service
 create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp6.service
 create mode 100644 meta/recipes-connectivity/kea/kea_1.7.7.bb
 create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.2.bb
 create mode 100644 meta/recipes-devtools/log4cplus/log4cplus_2.0.5.bb
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/6 libuv: move from meta-oe to core for bind update

From: Armin Kuster <[email protected]>

---
 meta/conf/distro/include/maintainers.inc      |  1 +
 .../libuv/libuv_1.34.2.bb                     | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.2.bb
meta/conf/distro/include/maintainers.inc +1 -0
index 6496a48e40..fc1b5272da 100644
@@ -393,6 +393,7 @@ RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-libubootenv = "Stefano Babic <[email protected]>"
+RECIPE_MAINTAINER_pn-libuv = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libva = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-libva-initial = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal <[email protected]>"
meta/recipes-connectivity/libuv/libuv_1.34.2.bb new file +19 -0
new file mode 100644
index 0000000000..234cec37bb
@@ -0,0 +1,19 @@
+SUMMARY = "A multi-platform support library with a focus on asynchronous I/O"
+HOMEPAGE = "https://github.com/libuv/libuv"
+BUGTRACKER = "https://github.com/libuv/libuv/issues"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47"
+
+SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837"
+SRC_URI = "git://github.com/libuv/libuv;branch=v1.x"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+do_configure() {
+    ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh"
+    oe_runconf
+}
+
+BBCLASSEXTEND = "native"
Signature · 1 line
2.17.1
#2 lore raw

Re: [OE-core] [PATCH 1/6] libuv: move from meta-oe to core for bind update

Looks like 1.34.2 was imported from meta-oe, but there was 1.38.0 version (as removed in
https://git.openembedded.org/meta-openembedded/commit/?id=4413f4cb70a5a4cf11c2f9c1881c4506860c588c)
causing downgrade as shown by QA checks like:
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0 do_packagedata_setscene: QA
Issue: Package version for package libuv-src went backwards which would break package feeds (from 0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0 do_packagedata_setscene: QA
Issue: Package version for package libuv-dbg went backwards which would break package feeds (from 0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0 do_packagedata_setscene: QA
Issue: Package version for package libuv-staticdev went backwards which would break package feeds (from 0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0 do_packagedata_setscene: QA
Issue: Package version for package libuv-dev went backwards which would break package feeds (from 0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0 do_packagedata_setscene: QA
Issue: Package version for package libuv-doc went backwards which would break package feeds (from 0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0 do_packagedata_setscene: QA
Issue: Package version for package libuv-locale went backwards which would break package feeds (from 0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0 do_packagedata_setscene: QA
Issue: Package version for package libuv went backwards which would break package feeds (from 0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]

these 3 meta-oe commits are now missing in oe-core:
https://git.openembedded.org/meta-openembedded/commit/?id=e03b48481438c747322f07ac1e1f04add541ffac
https://git.openembedded.org/meta-openembedded/commit/?id=9b61f412d36b390f8d71ad1fb5875f5f6e32fd8a
https://git.openembedded.org/meta-openembedded/commit/?id=644ea1ee145902b00e4e66856ebe8d8800dfc1f0

Quoted 57 lines · akuster

From: Armin Kuster <[email protected]>

---
 meta/conf/distro/include/maintainers.inc      |  1 +
 .../libuv/libuv_1.34.2.bb                     | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.2.bb
meta/conf/distro/include/maintainers.inc +0 -0
index 6496a48e40..fc1b5272da 100644
@@ -393,6 +393,7 @@ RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin <

[email protected]>"
RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling <
[email protected]>"
RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-libubootenv = "Stefano Babic <[email protected]>"
+RECIPE_MAINTAINER_pn-libuv = "Armin Kuster <[email protected]>"
RECIPE_MAINTAINER_pn-libva = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-libva-initial = "Anuj Mittal <[email protected]

Quoted 1 line

"

RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal <[email protected]>"

meta/recipes-connectivity/libuv/libuv_1.34.2.bb new file +1 -0
new file mode 100644
index 0000000000..234cec37bb
@@ -0,0 +1,19 @@
+SUMMARY = "A multi-platform support library with a focus on asynchronous

I/O"

meta/recipes-connectivity/libuv/libuv_1.34.2.bb new file +18 -1
+HOMEPAGE = "https://github.com/libuv/libuv"
+BUGTRACKER = "https://github.com/libuv/libuv/issues"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47"
+
+SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837"
+SRC_URI = "git://github.com/libuv/libuv;branch=v1.x"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+do_configure() {
+    ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh"
+    oe_runconf
+}
+
+BBCLASSEXTEND = "native"
--

2.17.1

author
#3 lore raw

Re: [OE-core] [PATCH 1/6] libuv: move from meta-oe to core for bind update

Quoted 33 lines · Martin Jansa

Looks like 1.34.2 was imported from meta-oe, but there was 1.38.0
version (as removed
in https://git.openembedded.org/meta-openembedded/commit/?id=4413f4cb70a5a4cf11c2f9c1881c4506860c588c)
causing downgrade as shown by QA checks like:
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0
do_packagedata_setscene: QA Issue: Package version for package
libuv-src went backwards which would break package feeds (from
0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0
do_packagedata_setscene: QA Issue: Package version for package
libuv-dbg went backwards which would break package feeds (from
0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0
do_packagedata_setscene: QA Issue: Package version for package
libuv-staticdev went backwards which would break package feeds (from
0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0
do_packagedata_setscene: QA Issue: Package version for package
libuv-dev went backwards which would break package feeds (from
0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0
do_packagedata_setscene: QA Issue: Package version for package
libuv-doc went backwards which would break package feeds (from
0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0
do_packagedata_setscene: QA Issue: Package version for package
libuv-locale went backwards which would break package feeds (from
0:1.38.0-r0 to 0:1.34.2-r0) [version-going-backwards]
log.world-all.qemux86-64:ERROR: libuv-1.34.2-r0
do_packagedata_setscene: QA Issue: Package version for package libuv
went backwards which would break package feeds (from 0:1.38.0-r0 to
0:1.34.2-r0) [version-going-backwards]

Quoted 5 lines

these 3 meta-oe commits are now missing in oe-core:
https://git.openembedded.org/meta-openembedded/commit/?id=e03b48481438c747322f07ac1e1f04add541ffac
https://git.openembedded.org/meta-openembedded/commit/?id=9b61f412d36b390f8d71ad1fb5875f5f6e32fd8a
https://git.openembedded.org/meta-openembedded/commit/?id=644ea1ee145902b00e4e66856ebe8d8800dfc1f0

Oh, that is not good. I will be sending an upgrade patch soon.

-armin

Quoted 75 lines

On Mon, Jun 22, 2020 at 4:19 PM akuster <[email protected] <mailto:[email protected]>> wrote:

    From: Armin Kuster <[email protected] <mailto:[email protected]>>

    Signed-off-by: Armin Kuster <[email protected]
    <mailto:[email protected]>>
    ---
     meta/conf/distro/include/maintainers.inc      |  1 +
     .../libuv/libuv_1.34.2.bb <http://libuv_1.34.2.bb>               
         | 19 +++++++++++++++++++
     2 files changed, 20 insertions(+)
     create mode 100644
    meta/recipes-connectivity/libuv/libuv_1.34.2.bb
    <http://libuv_1.34.2.bb>

    diff --git a/meta/conf/distro/include/maintainers.inc
    b/meta/conf/distro/include/maintainers.inc
    index 6496a48e40..fc1b5272da 100644
    --- a/meta/conf/distro/include/maintainers.inc
    +++ b/meta/conf/distro/include/maintainers.inc
    @@ -393,6 +393,7 @@ RECIPE_MAINTAINER_pn-liburcu = "Alexander
    Kanavin <[email protected] <mailto:[email protected]>>"
     RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling
    <[email protected]
    <mailto:[email protected]>>"
     RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal
    <[email protected] <mailto:[email protected]>>"
     RECIPE_MAINTAINER_pn-libubootenv = "Stefano Babic <[email protected]
    <mailto:[email protected]>>"
    +RECIPE_MAINTAINER_pn-libuv = "Armin Kuster <[email protected]
    <mailto:[email protected]>>"
     RECIPE_MAINTAINER_pn-libva = "Anuj Mittal <[email protected]
    <mailto:[email protected]>>"
     RECIPE_MAINTAINER_pn-libva-initial = "Anuj Mittal
    <[email protected] <mailto:[email protected]>>"
     RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal
    <[email protected] <mailto:[email protected]>>"
    diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.2.bb
    <http://libuv_1.34.2.bb>
    b/meta/recipes-connectivity/libuv/libuv_1.34.2.bb
    <http://libuv_1.34.2.bb>
    new file mode 100644
    index 0000000000..234cec37bb
    --- /dev/null
    +++ b/meta/recipes-connectivity/libuv/libuv_1.34.2.bb
    <http://libuv_1.34.2.bb>
    @@ -0,0 +1,19 @@
    +SUMMARY = "A multi-platform support library with a focus on
    asynchronous I/O"
    +HOMEPAGE = "https://github.com/libuv/libuv"
    +BUGTRACKER = "https://github.com/libuv/libuv/issues"
    +LICENSE = "MIT"
    +LIC_FILES_CHKSUM =
    "file://LICENSE;md5=a68902a430e32200263d182d44924d47"
    +
    +SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837"
    +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x
    <http://github.com/libuv/libuv;branch=v1.x>"
    +
    +S = "${WORKDIR}/git"
    +
    +inherit autotools
    +
    +do_configure() {
    +    ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh"
    +    oe_runconf
    +}
    +
    +BBCLASSEXTEND = "native"
    -- 
    2.17.1
author
#4 lore raw

PATCH 2/6 bind: Update to latest ESV version 9.16

In reply to akuster

From: Armin Kuster <[email protected]>

Removed obsolete packageconfig options

License change to MPL-2.0
https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE

Refreshed:
bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch bind-ensure-searching-for-json-headers-searches-sysr.patch

Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch

---
 ....in-remove-useless-L-use_openssl-lib.patch | 30 ---------------
 ...d-V-and-start-log-hide-build-options.patch | 33 +++++++++--------
 ...ching-for-json-headers-searches-sysr.patch | 14 +++----
 .../bind/{bind_9.11.19.bb => bind_9.16.4.bb}  | 37 ++++++-------------
 4 files changed, 35 insertions(+), 79 deletions(-)
 delete mode 100644 meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch
 rename meta/recipes-connectivity/bind/{bind_9.11.19.bb => bind_9.16.4.bb} (77%)
meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch deleted +0 -30
deleted file mode 100644
index 9d31b98080..0000000000
@@ -1,30 +0,0 @@
-From 2325a92f1896a2a7f586611686801b41fbc91b50 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Mon, 27 Aug 2018 15:00:51 +0800
-Subject: [PATCH] configure.in: remove useless `-L$use_openssl/lib'
-
-Since `--with-openssl=${STAGING_DIR_HOST}${prefix}' is used in bind recipe,
-the `-L$use_openssl/lib' has a hardcoded suffix, removing it is harmless
-and helpful for clean up host build path in isc-config.sh
-
-Upstream-Status: Inappropriate [oe-core specific]
-
-Signed-off-by: Hongxu Jia <[email protected]>
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e85a5c6..2bbfc58 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1631,7 +1631,7 @@ If you don't want OpenSSL, use --without-openssl])
- 				fi
- 				;;
- 			*)
--				DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
-+				DST_OPENSSL_LIBS="-lcrypto"
- 				;;
- 			esac
- 		fi
meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch +17 -16
index 75908aa638..5bcc16c9b2 100644
@@ -12,23 +12,24 @@ $ named -V
 Upstream-Status: Inappropriate [oe-core specific]
 
 Signed-off-by: Hongxu Jia <[email protected]>
+
+Refreshed for 9.16.0
+Signed-off-by: Armin Kuster <[email protected]>
+
 ---
  bin/named/include/named/globals.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
-index ba3457e..7741da7 100644
---- a/bin/named/include/named/globals.h
-+++ b/bin/named/include/named/globals.h
-@@ -68,7 +68,7 @@ EXTERN const char *		ns_g_version		INIT(VERSION);
- EXTERN const char *		ns_g_product		INIT(PRODUCT);
- EXTERN const char *		ns_g_description	INIT(DESCRIPTION);
- EXTERN const char *		ns_g_srcid		INIT(SRCID);
--EXTERN const char *		ns_g_configargs		INIT(CONFIGARGS);
-+EXTERN const char *		ns_g_configargs		INIT("*** (options are hidden)");
- EXTERN const char *		ns_g_builder		INIT(BUILDER);
- EXTERN in_port_t		ns_g_port		INIT(0);
- EXTERN isc_dscp_t		ns_g_dscp		INIT(-1);
--- 
-2.7.4
-
+Index: bind-9.16.0/bin/named/include/named/globals.h
+===================================================================
+--- bind-9.16.0.orig/bin/named/include/named/globals.h
++++ bind-9.16.0/bin/named/include/named/globals.h
+@@ -69,7 +69,7 @@ EXTERN const char *named_g_version     I
+ EXTERN const char *named_g_product     INIT(PRODUCT);
+ EXTERN const char *named_g_description INIT(DESCRIPTION);
+ EXTERN const char *named_g_srcid       INIT(SRCID);
+-EXTERN const char *named_g_configargs  INIT(CONFIGARGS);
++EXTERN const char *named_g_configargs  INIT("*** (options are hidden)");
+ EXTERN const char *named_g_builder     INIT(BUILDER);
+ EXTERN in_port_t named_g_port	       INIT(0);
+ EXTERN isc_dscp_t named_g_dscp	       INIT(-1);
meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch +7 -7
index 84559e5f37..f9cdc7ca4d 100644
@@ -32,16 +32,16 @@ Signed-off-by: Paul Gortmaker <[email protected]>
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/configure.ac b/configure.ac
-index 17392fd..e85a5c6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2449,7 +2449,7 @@ case "$use_libjson" in
- 		libjson_libs=""
+Index: bind-9.16.4/configure.ac
+===================================================================
+--- bind-9.16.4.orig/configure.ac
++++ bind-9.16.4/configure.ac
+@@ -1232,7 +1232,7 @@ case "$use_lmdb" in
+ 		LMDB_LIBS=""
  		;;
  	auto|yes)
 -		for d in /usr /usr/local /opt/local
 +		for d in "${STAGING_INCDIR}"
  		do
- 			if test -f "${d}/include/json/json.h"
+ 			if test -f "${d}/include/lmdb.h"
  			then
meta/recipes-connectivity/bind/bind_9.16.4.bb renamed from meta/recipes-connectivity/bind/bind_9.11.19.bb +11 -26
similarity index 77%
rename from meta/recipes-connectivity/bind/bind_9.11.19.bb
rename to meta/recipes-connectivity/bind/bind_9.16.4.bb
index 276173e09f..d55d662cee 100644
@@ -2,12 +2,12 @@ SUMMARY = "ISC Internet Domain Name Server"
 HOMEPAGE = "http://www.isc.org/sw/bind/"
 SECTION = "console/network"
 
-LICENSE = "ISC & BSD"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bf39058a7f64b2a934ce14dc9ec1dd45"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1"
 
-DEPENDS = "openssl libcap zlib"
+DEPENDS = "openssl libcap zlib libuv"
 
-SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
+SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
            file://conf.patch \
            file://named.service \
            file://bind9 \
@@ -15,20 +15,15 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
            file://make-etc-initd-bind-stop-work.patch \
            file://init.d-add-support-for-read-only-rootfs.patch \
            file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
-           file://0001-configure.in-remove-useless-L-use_openssl-lib.patch \
            file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
            file://0001-avoid-start-failure-with-bind-user.patch \
            "
 
-SRC_URI[sha256sum] = "0dee554a4caa368948b32da9a0c97b516c19103bc13ff5b3762c5d8552f52329"
+SRC_URI[sha256sum] = "7522088d3daac8bcabaae37998178e09139ef5ccae6631cb1d8a625b770f370a"
 
 UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
-# stay at 9.11 until 9.16, from 9.16 follow the ESV versions divisible by 4
-UPSTREAM_CHECK_REGEX = "(?P<pver>9.(11|16|20|24|28)(\.\d+)+(-P\d+)*)/"
-
-# BIND >= 9.11.2 need dhcpd >= 4.4.0,
-# don't report it here since dhcpd is already recent enough.
-CVE_CHECK_WHITELIST += "CVE-2019-6470"
+# stay at 9.16 follow the ESV versions divisible by 4
+UPSTREAM_CHECK_REGEX = "(?P<pver>9.(16|20|24|28)(\.\d+)+(-P\d+)*)/"
 
 inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header
 
@@ -39,17 +34,14 @@ PACKAGECONFIG ?= "readline"
 PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2"
 PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
 PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
-PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,,"
 PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native,"
 
-ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}"
-EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \
-                 --disable-devpoll --enable-epoll --with-gost=no \
-                 --with-gssapi=no --with-ecdsa=yes --with-eddsa=no \
-                 --with-lmdb=no \
+EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \
+                 --with-gssapi=no --with-lmdb=no --with-zlib \
                  --sysconfdir=${sysconfdir}/bind \
                  --with-openssl=${STAGING_DIR_HOST}${prefix} \
                "
+LDFLAGS_append = " -lz"
 
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)}
 
@@ -65,13 +57,6 @@ INITSCRIPT_PARAMS = "defaults"
 
 SYSTEMD_SERVICE_${PN} = "named.service"
 
-do_install_prepend() {
-	# clean host path in isc-config.sh before the hardlink created
-	# by "make install":
-	#   bind9-config -> isc-config.sh
-	sed -i -e "s,${STAGING_LIBDIR},${libdir}," ${B}/isc-config.sh
-}
-
 do_install_append() {
 
 	rmdir "${D}${localstatedir}/run"
@@ -129,7 +114,7 @@ FILES_${PN}-dev += "${bindir}/isc-config.h"
 FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
 
 PACKAGE_BEFORE_PN += "${PN}-libs"
-FILES_${PN}-libs = "${libdir}/*.so*"
+FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.so*"
 FILES_${PN}-staticdev += "${libdir}/*.la"
 
 PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}"
Signature · 1 line
2.17.1
author
#5 lore raw

PATCH 3/6 log4cplus: move meta-oe pkg to core

In reply to akuster

pkg need for kea

---
 .../log4cplus/log4cplus_2.0.5.bb              | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta/recipes-devtools/log4cplus/log4cplus_2.0.5.bb
meta/recipes-devtools/log4cplus/log4cplus_2.0.5.bb new file +19 -0
new file mode 100644
index 0000000000..967ac7623a
@@ -0,0 +1,19 @@
+SUMMARY = "log4cplus provides a simple C++ logging API for log management"
+SECTION = "libs"
+HOMEPAGE = "http://sourceforge.net/projects/log4cplus/"
+BUGTRACKER = "http://sourceforge.net/p/log4cplus/bugs/"
+
+LICENSE = "Apache-2.0 & BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \
+          "
+SRC_URI[md5sum] = "71dd956bf686195127559671f1426cff"
+SRC_URI[sha256sum] = "c07115c23219390633798def30b7b51a0f79fdeb857e4b49632f17746d0ceb97"
+
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/"
+UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P<pver>\d+(\.\d+)+)/"
+
+inherit autotools pkgconfig
+
+BBCLASSEXTEND = "native"
Signature · 1 line
2.17.1
author
#6 lore raw

PATCH 4/6 kea: Move to core

In reply to akuster

ISC dhcp is being retiered by kea.

Move kea from meta-oe to core

---
 .../kea/files/0001-remove-AC_TRY_RUN.patch    | 34 ++++++++++
 .../kea/files/kea-dhcp-ddns.service           | 13 ++++
 .../kea/files/kea-dhcp4.service               | 13 ++++
 .../kea/files/kea-dhcp6.service               | 13 ++++
 meta/recipes-connectivity/kea/kea_1.7.7.bb    | 67 +++++++++++++++++++
 5 files changed, 140 insertions(+)
 create mode 100644 meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch
 create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service
 create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp4.service
 create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp6.service
 create mode 100644 meta/recipes-connectivity/kea/kea_1.7.7.bb
meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch new file +34 -0
new file mode 100644
index 0000000000..d7ca9ff8fa
@@ -0,0 +1,34 @@
+From 9d6b8321c5b46199baca907f3d42bdcaaf1958a8 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <[email protected]>
+Date: Thu, 23 May 2019 23:59:42 -0700
+Subject: [PATCH] remove AC_TRY_RUN
+
+AC_TRY_RUN doesn't work in cross compile env,
+use AC_COMPILE_IFELSE instead to fix below configure
+error:
+ | checking for usuable C++11 regex... configure: error: in `/builddir/tmp/work/core2-64-poky-linux/kea/1.5.0-r0/build':
+ | configure: error: cannot run test program while cross compiling
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Mingli Yu <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c880b77..dd40c7c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -580,7 +580,7 @@ AC_TRY_COMPILE([
+         AC_MSG_RESULT(no))
+ 
+ AC_MSG_CHECKING(for usuable C++11 regex)
+-AC_TRY_RUN([
++AC_COMPILE_IFELSE([
+ #include <regex>
+ #include <iostream>
+ int main() {
+-- 
+2.21.0
+
meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service new file +13 -0
new file mode 100644
index 0000000000..91aa2eb14f
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCP-DDNS Server
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea
+ExecStart=@SBINDIR@/kea-dhcp-ddns -c @SYSCONFDIR@/kea/kea-dhcp-ddns.conf
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/kea/files/kea-dhcp4.service new file +13 -0
new file mode 100644
index 0000000000..b851ea71c5
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCPv4 Server
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
+ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/kea/files/kea-dhcp6.service new file +13 -0
new file mode 100644
index 0000000000..0f9f0ef8d9
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCPv6 Server
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
+ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf
+
+[Install]
+WantedBy=multi-user.target
meta/recipes-connectivity/kea/kea_1.7.7.bb new file +67 -0

67 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#7 lore raw

PATCH 5/6 dhcp: remove depricated package

In reply to akuster

replaces by kea

---
 meta/recipes-connectivity/dhcp/dhcp.inc       | 149 ------------------
 ...TH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  27 ----
 ...-limitation-in-linux-dhclient-script.patch |  65 --------
 .../dhcp/dhcp/0002-dhclient-dbus.patch        | 117 --------------
 .../dhcp/dhcp/0003-link-with-lcrypto.patch    |  35 ----
 .../dhcp/0004-Fix-out-of-tree-builds.patch    |  95 -----------
 ...invoke-dhclient-script-failed-on-Rea.patch |  36 -----
 ...gument-to-make-the-libxml2-dependenc.patch |  62 --------
 ...move-dhclient-script-bash-dependency.patch |  28 ----
 ...ct-the-intention-for-xml2-lib-search.patch |  34 ----
 .../dhcp/dhcp/0013-fixup_use_libbind.patch    |  64 --------
 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb  |  21 ---
 12 files changed, 733 deletions(-)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp.inc
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb
meta/recipes-connectivity/dhcp/dhcp.inc deleted +0 -149
deleted file mode 100644
index d46130d49b..0000000000
@@ -1,149 +0,0 @@
-SECTION = "console/network"
-SUMMARY = "Internet Software Consortium DHCP package"
-DESCRIPTION = "DHCP (Dynamic Host Configuration Protocol) is a protocol \
-which allows individual devices on an IP network to get their own \
-network configuration information from a server.  DHCP helps make it \
-easier to administer devices."
-
-HOMEPAGE = "http://www.isc.org/"
-
-LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"
-
-DEPENDS = "openssl bind"
-
-SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
-           file://init-relay file://default-relay \
-           file://init-server file://default-server \
-           file://dhclient.conf file://dhcpd.conf \
-           file://dhclient-systemd-wrapper \
-           file://dhclient.service \
-           file://dhcpd.service file://dhcrelay.service \
-           file://dhcpd6.service \
-           "
-UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
-
-inherit autotools-brokensep systemd useradd update-rc.d
-
-USERADD_PACKAGES = "${PN}-server"
-USERADD_PARAM_${PN}-server = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}"
-
-SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay ${PN}-client"
-SYSTEMD_SERVICE_${PN}-server = "dhcpd.service dhcpd6.service"
-SYSTEMD_AUTO_ENABLE_${PN}-server = "disable"
-
-SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service"
-SYSTEMD_AUTO_ENABLE_${PN}-relay = "disable"
-
-SYSTEMD_SERVICE_${PN}-client = "dhclient.service"
-SYSTEMD_AUTO_ENABLE_${PN}-client = "disable"
-
-INITSCRIPT_PACKAGES = "dhcp-server"
-INITSCRIPT_NAME_dhcp-server = "dhcp-server"
-INITSCRIPT_PARAMS_dhcp-server = "defaults"
-
-CFLAGS += "-D_GNU_SOURCE"
-EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
-                --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
-                --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
-                --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
-                --enable-paranoia --disable-static \
-                --with-randomdev=/dev/random \
-                --with-libbind=${STAGING_DIR_HOST} \
-		--enable-libtool \
-               "
-
-#Enable shared libs per dhcp README
-do_configure_prepend () {
-	cp configure.ac+lt configure.ac
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/init.d
-	install -d ${D}${sysconfdir}/default
-	install -d ${D}${sysconfdir}/dhcp
-	install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay
-	install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay
-	install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server
-	install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server
-
-	rm -f ${D}${sysconfdir}/dhclient.conf*
-	rm -f ${D}${sysconfdir}/dhcpd.conf*
-	install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf
-	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
-
-	install -d ${D}${base_sbindir}/
-	if [ "${sbindir}" != "${base_sbindir}" ]; then
-		mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
-	fi
-	install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
-
-	# Install systemd unit files
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/dhcpd6.service ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
-	sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service ${D}${systemd_unitdir}/system/dhcrelay.service
-	sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-	sed -i -e 's,@base_bindir@,${base_bindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-	sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-	sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service
-
-	install -d ${D}${base_sbindir}
-	install -m 0755 ${WORKDIR}/dhclient-systemd-wrapper ${D}${base_sbindir}/dhclient-systemd-wrapper
-	install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system
-	sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhclient.service
-	sed -i -e 's,@BASE_SBINDIR@,${base_sbindir},g' ${D}${systemd_unitdir}/system/dhclient.service
-}
-
-PACKAGES += "dhcp-libs dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
-
-PACKAGES_remove = "${PN}"
-RDEPENDS_${PN}-client += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'iproute2', '', d)}"
-RDEPENDS_${PN}-dev = ""
-RDEPENDS_${PN}-staticdev = ""
-FILES_${PN}-libs = "${libdir}/libdhcpctl.so.0* ${libdir}/libomapi.so.0* ${libdir}/libdhcp.so.0*"
-
-FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
-RRECOMMENDS_${PN}-server = "dhcp-server-config"
-
-FILES_${PN}-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
-
-FILES_${PN}-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
-
-FILES_${PN}-client = "${base_sbindir}/dhclient \
-                      ${base_sbindir}/dhclient-script \
-                      ${sysconfdir}/dhcp/dhclient.conf \
-                      ${base_sbindir}/dhclient-systemd-wrapper \
-                     "
-
-FILES_${PN}-omshell = "${bindir}/omshell"
-
-pkg_postinst_dhcp-server() {
-    mkdir -p $D/${localstatedir}/lib/dhcp
-    touch $D/${localstatedir}/lib/dhcp/dhcpd.leases
-    touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases
-}
-
-pkg_postinst_dhcp-client() {
-    mkdir -p $D/${localstatedir}/lib/dhcp
-}
-
-pkg_postrm_dhcp-server() {
-    rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases
-    rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases
-
-    if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
-        echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
-    fi
-}
-
-pkg_postrm_dhcp-client() {
-    rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
-    rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
-
-    if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
-        echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
-    fi
-}
meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch deleted +0 -27
deleted file mode 100644
index d1b57f0bb4..0000000000
@@ -1,27 +0,0 @@
-From 7cc29144535a622fc671dc86eb1da65b0473a7c4 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 16:14:22 +0800
-Subject: [PATCH 01/11] define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF
-
-Upstream-Status: Inappropriate [OE specific]
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- includes/site.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: dhcp-4.4.1/includes/site.h
-===================================================================
---- dhcp-4.4.1.orig/includes/site.h
-+++ dhcp-4.4.1/includes/site.h
-@@ -148,7 +148,8 @@
- /* Define this if you want the dhcpd.conf file to go somewhere other than
-    the default location.   By default, it goes in /etc/dhcpd.conf. */
- 
--/* #define _PATH_DHCPD_CONF	"/etc/dhcpd.conf" */
-+#define _PATH_DHCPD_CONF	"/etc/dhcp/dhcpd.conf"
-+#define _PATH_DHCLIENT_CONF	"/etc/dhcp/dhclient.conf"
- 
- /* Network API definitions.   You do not need to choose one of these - if
-    you don't choose, one will be chosen for you in your system's config
meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch deleted +0 -65

65 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch deleted +0 -117

117 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch deleted +0 -35
deleted file mode 100644
index 5b35933a54..0000000000
@@ -1,35 +0,0 @@
-From d80bd792323dbd56269309f85b4506eb6b1b60e9 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <[email protected]>
-Date: Tue, 15 Aug 2017 15:05:47 +0800
-Subject: [PATCH 03/11] link with lcrypto
-
-From 4.2.0 final release, -lcrypto check was removed and we compile
-static libraries
-from bind that are linked to libcrypto. This is why i added a patch in
-order to add
--lcrypto to LIBS.
-
-Upstream-Status: Pending
-Signed-off-by: Andrei Gherzan <[email protected]>
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: dhcp-4.4.1/configure.ac
-===================================================================
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -612,6 +612,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
- # Look for optional headers.
- AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
- 
-+# find an MD5 library
-+AC_SEARCH_LIBS(MD5_Init, [crypto])
-+AC_SEARCH_LIBS(MD5Init, [crypto])
-+
- # Solaris needs some libraries for functions
- AC_SEARCH_LIBS(socket, [socket])
- AC_SEARCH_LIBS(inet_ntoa, [nsl])
meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch deleted +0 -95

95 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch deleted +0 -36
deleted file mode 100644
index dd56381b1d..0000000000
@@ -1,36 +0,0 @@
-From 2e8ff0e4f6d39e346ea86b8c514ab4ccc78fa359 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 15 Aug 2017 15:24:14 +0800
-Subject: [PATCH 05/11] dhcp-client: fix invoke dhclient-script failed on
- Read-only file system
-
-In read-only file system, '/etc' is on the readonly partition,
-and '/etc/resolv.conf' is symlinked to a separate writable
-partition.
-
-In this situation, we create temp files 'resolv.conf.dhclient-new'
-in /tmp dir.
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 3d447b6..3122a75 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -40,7 +40,7 @@ make_resolv_conf() {
-     # DHCPv4
-     if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
-        [ -n "$new_domain_name_servers" ]; then
--        new_resolv_conf=/etc/resolv.conf.dhclient-new
-+        new_resolv_conf=/tmp/resolv.conf.dhclient-new
-         rm -f $new_resolv_conf
- 
-         if [ -n "$new_domain_name" ]; then
--- 
-1.8.3.1
-
meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted +0 -62

62 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch deleted +0 -28
deleted file mode 100644
index 912b6d6312..0000000000
@@ -1,28 +0,0 @@
-From f3f8b7726e50e24ef3edf5fa5a17e31d39118d7e Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-Date: Tue, 15 Aug 2017 15:49:31 +0800
-Subject: [PATCH 09/11] remove dhclient-script bash dependency
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Andre McCurdy <[email protected]>
-
-Rebase to 4.3.6
-Signed-off-by: Hongxu Jia <[email protected]>
----
- client/scripts/linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 3122a75..1712d7d 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # dhclient-script for Linux. Dan Halbert, March, 1997.
- # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
- # No guarantees about this. I'm a novice at the details of Linux
--- 
-1.8.3.1
-
meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch deleted +0 -34
deleted file mode 100644
index 39ba65fbc4..0000000000
@@ -1,34 +0,0 @@
-From 501543b3ef715488a142e3d301ff2733aa33eec7 Mon Sep 17 00:00:00 2001
-From: Awais Belal <[email protected]>
-Date: Wed, 25 Oct 2017 21:00:05 +0500
-Subject: [PATCH] dhcp: correct the intention for xml2 lib search
-
-A missing case breaks the build when libxml2 is
-required and found appropriately. The third argument
-to the function AC_SEARCH_LIB is action-if-found which
-was mistakenly been used for the case where the library
-is not found and hence breaks the configure phase
-where it shoud actually pass.
-We now pass on silently when action-if-found is
-executed.
-
-Upstream-Status: Pending
-
-Signed-off-by: Awais Belal <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: dhcp-4.4.1/configure.ac
-===================================================================
---- dhcp-4.4.1.orig/configure.ac
-+++ dhcp-4.4.1/configure.ac
-@@ -647,7 +647,7 @@ AC_ARG_WITH(libxml2,
- 	with_libxml2="$withval", with_libxml2="no")
- 
- if test x$with_libxml2 != xno; then
--	AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
-+	AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
- 		[if test x$with_libxml2 != xauto; then
- 			AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
- 		fi])
meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch deleted +0 -64

64 lines not on this page · raw message

meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb deleted +0 -21
deleted file mode 100644
index b56a204821..0000000000
@@ -1,21 +0,0 @@
-require dhcp.inc
-
-SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
-            file://0002-dhclient-dbus.patch \
-            file://0003-link-with-lcrypto.patch \
-            file://0004-Fix-out-of-tree-builds.patch \
-            file://0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch \
-            file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \
-            file://0009-remove-dhclient-script-bash-dependency.patch \
-            file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
-            file://0013-fixup_use_libbind.patch \
-            file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \
-"
-
-SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
-SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"
-
-LDFLAGS_append = " -pthread"
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
Signature · 1 line
2.17.1
author
#8 lore raw

PATCH 6/6 maintainers.inc: add new packages remove dhcp

In reply to akuster
---
 meta/conf/distro/include/maintainers.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/conf/distro/include/maintainers.inc +3 -2
index fc1b5272da..31dfbf5064 100644
@@ -144,7 +144,6 @@ RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi <[email protected]>"
 RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle <[email protected]>"
 RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt <[email protected]>"
 RECIPE_MAINTAINER_pn-diffstat = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-diffutils = "Chen Qi <[email protected]>"
@@ -286,6 +285,7 @@ RECIPE_MAINTAINER_pn-json-c = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-jquery = "Joshua Watt <[email protected]>"
 RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin <[email protected]>"
+RECIPE_MAINTAINER_pn-kea = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-kexec-tools = "Armin Kuster <[email protected]>"
@@ -393,7 +393,7 @@ RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-libubootenv = "Stefano Babic <[email protected]>"
-RECIPE_MAINTAINER_pn-libuv = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libuv = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libva = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-libva-initial = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal <[email protected]>"
@@ -449,6 +449,7 @@ RECIPE_MAINTAINER_pn-linux-yocto-rt = "Bruce Ashfield <[email protected]>
 RECIPE_MAINTAINER_pn-linux-yocto-tiny = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-llvm = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-logrotate = "Yi Zhao <[email protected]>"
+RECIPE_MAINTAINER_pn-log4cplus = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-lrzsz = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-lsb-release = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-lsof = "Ross Burton <[email protected]>"
Signature · 1 line
2.17.1