mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

dhcp-relay: update bundled bind to 9.11.32

Browse Source 
Update the bundled bind from 9.11.14 to 9.11.32.

Fixes build error on qemuarmv5:
stats.c: In function 'setcounter':
stats.c:300:36: error: 'val' undeclared (first use in this function); did you mean 'value'?
  300 |         stats->counters[counter] = val;
      |                                    ^~~
      |                                    value

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2021-06-08 14:02:01 +08:00
committed by Khem Raj
parent cfb70a6bbc
commit ca31e8057a
2 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb
View File

@@ -11,14 +11,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747
DEPENDS = "openssl libcap zlib"
SRC_URI = "https://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;downloadfilename=bind.tar.gz;unpack=0 \
file://default-relay \
file://init-relay \
file://dhcrelay.service \
file://0001-Makefile.am-only-build-dhcrelay.patch \
file://0002-bind-version-update-to-latest-version.patch \
"
SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"
SRC_URI[bind.md5sum] = "0d029dd06ca60c6739c3189c999ef757"
SRC_URI[bind.sha256sum] = "cbf8cb4b74dd1452d97c3a2a8c625ea346df8516b4b3508ef07443121a591342"
UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
@@ -43,15 +47,18 @@ EXTRA_OEMAKE += "LIBTOOL='${S}/${HOST_SYS}-libtool'"
# Enable shared libs per dhcp README
do_configure_prepend () {
cp configure.ac+lt configure.ac
rm ${S}/bind/bind.tar.gz
mv ${WORKDIR}/bind.tar.gz ${S}/bind/
}
do_compile_prepend() {
rm -rf ${S}/bind/bind-9.11.14/
rm -rf ${S}/bind/bind-9.11.32/
tar xf ${S}/bind/bind.tar.gz -C ${S}/bind
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.14/
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.14/
cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.14/libtool.m4/
rm -rf ${S}/bind/bind-9.11.14/libtool
install -m 0755 ${S}/${HOST_SYS}-libtool ${S}/bind/bind-9.11.14/
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.32/
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.32/
cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.32/libtool.m4/
rm -rf ${S}/bind/bind-9.11.32/libtool
install -m 0755 ${S}/${HOST_SYS}-libtool ${S}/bind/bind-9.11.32/
}
do_install_append () {

30
meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch Normal file
View File

@@ -0,0 +1,30 @@
From edb68972f8dc636e6208e78f02dec6f9805e4c0b Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 26 May 2021 11:39:00 +0800
Subject: [PATCH] bind/version: update to latest version
Update the bundled bind from 9.11.14 to 9.11.32.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
bind/version.tmp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bind/version.tmp b/bind/version.tmp
index cf52f1b..4cc538e 100644
--- a/bind/version.tmp
+++ b/bind/version.tmp
@@ -5,7 +5,7 @@ PRODUCT=BIND
DESCRIPTION="(Extended Support Version)"
MAJORVER=9
MINORVER=11
-PATCHVER=14
+PATCHVER=32
RELEASETYPE=
RELEASEVER=
EXTENSIONS=
--
2.17.1