cb85cff32b
Upgrade dhcp pkg to dhcp-4.2.5-82.el7.centos.src.rpm Adjust the context of the patch to match to apply the new version. At the same time as the new version depends on the bind-export pacakges, so we also add the dependence package in tools repo. bind-export-libs-9.11.4-26.P2.el7.x86_64.rpm bind-export-devel-9.11.4-26.P2.el7.x86_64.rpm In addition, since the patch dhcp-dhclient_ipv6_prefix.patch set the default prefixlen to 128, which is usually the specifications call for host address and it doesn't include any on-link information. By contrast, 64 indicates that's subnet area, and this vaule is used frequently as usual. So we still use the previous value 64. As a result we don't need to modify the relevant place where every application code needed for the compatibility any more. Depends-On: https://review.opendev.org/c/starlingx/tools/+/772241 Story: 2008532 Task: 41638 Change-Id: I0305711790d8e3fb1adfa69e1077468456b65d84 Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
28 lines
879 B
Diff
28 lines
879 B
Diff
From 1eeae27ddc87dc61928b96baa63fe2ff767e35b0 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:25:05 -0400
|
|
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
|
|
|
|
Conflicts:
|
|
SPECS/dhcp.spec
|
|
---
|
|
SPECS/dhcp.spec | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec
|
|
index 42409f6..70c7a6d 100644
|
|
--- a/SPECS/dhcp.spec
|
|
+++ b/SPECS/dhcp.spec
|
|
@@ -18,7 +18,7 @@
|
|
Summary: Dynamic host configuration protocol software
|
|
Name: dhcp
|
|
Version: 4.2.5
|
|
-Release: 82%{?dist}
|
|
+Release: 82.el7.centos%{?_tis_dist}.%{tis_patch_ver}
|
|
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
|
|
# dcantrell maintaining the package) made incorrect use of the epoch and
|
|
# that's why it is at 12 now. It should have never been used, but it was.
|
|
--
|
|
2.7.4
|
|
|