Refactor patches for initscripts package

Use initscripts-config package to package script and service file for
initscripts package.
Refactor 0001-Disable-zeroconf-route.patch,
spec-add-mountnfs-init-script.patch and
spec-include-TiS-changes.patch, let initscripts-config to be
responsible for the installation of config/script/service files.
Merged some meta patches that just includes adding source code patch to
spec-include-Tis-changes.patch.
Removed base/procps since it just includes one file, sysctl.conf. And
move this file to initscripts-config folder.The monitor-tools package
in stx-integ has a %post script that is adding an entry to sysctl.conf,
so add "Requires: initscripts-config" in monitor-tools.spec, to ensure
it is installed after this package replaces the file.

Deployment test and ping test between VMs pass
Service, config and script files check pass.

Story: 2003768
Task: 27585

Change-Id: I2ea3bd05bdc5bca5658d157e6f40f7380e922500
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2018-11-05 23:56:49 +08:00 committed by zhipeng liu
parent 2bd19e3f8f
commit 867dddc305
27 changed files with 101 additions and 535 deletions

View File

@ -0,0 +1,2 @@
SRC_DIR="files"
TIS_PATCH_VER=0

View File

@ -0,0 +1,47 @@
Summary: initscripts-config
Name: initscripts-config
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
License: Apache-2.0
Group: base
Packager: StarlingX
URL: unknown
BuildArch: noarch
Source: %name-%version.tar.gz
Requires: %{_bindir}/systemctl
Requires: initscripts
Summary: package StarlingX configuration files of initscripts to system folder.
%description
package StarlingX configuration files of initscripts to system folder.
%prep
%setup
%build
%install
%{__install} -d 644 %{buildroot}%{_datadir}/starlingx/
%{__install} -d 644 %{buildroot}%{_sysconfdir}/sysconfig
%{__install} -d 755 %{buildroot}%{_initddir}
%{__install} -d 644 %{buildroot}%{_unitdir}
%{__install} -m 644 sysctl.conf %{buildroot}%{_datadir}/starlingx/stx.sysctl.conf
%{__install} -m 644 sysconfig-network.conf %{buildroot}%{_sysconfdir}/sysconfig/network
%{__install} -m 755 mountnfs.sh %{buildroot}%{_initddir}/mountnfs
%{__install} -m 644 mountnfs.service %{buildroot}%{_unitdir}/mountnfs.service
%post
if [ $1 -eq 1 ] ; then
# Initial installation
cp -f %{_datadir}/starlingx/stx.sysctl.conf %{_sysconfdir}/sysctl.conf
chmod 644 %{_sysconfdir}/sysctl.conf
fi
%{_bindir}/systemctl enable mountnfs.service > /dev/null 2>&1 || :
%files
%{_datadir}/starlingx/stx.sysctl.conf
%{_sysconfdir}/sysconfig/network
%{_initddir}/mountnfs
%{_unitdir}/mountnfs.service

View File

@ -1,5 +1,5 @@
[Unit]
Description=Titanium Cloud Filesystem Auto-mounter
Description=StarlingX Cloud Filesystem Auto-mounter
After=network.target nfscommon.service
Before=uexportfs.service

View File

@ -0,0 +1 @@
ZEROCONF=yes

View File

@ -1,19 +0,0 @@
Metadata-Version: 1.1
Name: libevent
Version: 2.0.21
Summary: Abstract asynchronous event notification library
Home-page:
Author:
Author-email:
License: BSD
Description:
The libevent API provides a mechanism to execute a callback function
when a specific event occurs on a file descriptor or after a timeout
has been reached. libevent is meant to replace the asynchronous event
loop found in event driven network servers. An application just needs
to call event_dispatch() and can then add or remove events dynamically
without having to change the event loop.
Platform: UNKNOWN

View File

@ -1,2 +1 @@
COPY_LIST="$FILES_BASE/* $GIT_BASE/base/procps/files/sysctl.conf"
TIS_PATCH_VER=16
TIS_PATCH_VER=17

View File

@ -1,59 +0,0 @@
From 21388fc6c11be326dbdae193dd05dce56fdb5b03 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 03/13] WRS: 0001-Disable-zeroconf-route.patch
Conflicts:
SPECS/initscripts.spec
---
SOURCES/sysconfig-network.conf | 1 +
SPECS/initscripts.spec | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 SOURCES/sysconfig-network.conf
diff --git a/SOURCES/sysconfig-network.conf b/SOURCES/sysconfig-network.conf
new file mode 100644
index 0000000..5b2803b
--- /dev/null
+++ b/SOURCES/sysconfig-network.conf
@@ -0,0 +1 @@
+NOZEROCONF=yes
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 5349c54..6a7a76d 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,12 +4,13 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
-Release: 1%{?dist}
+Release: 1%{?dist}.4
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# WRS
Source1: sysctl.conf
+Source2: sysconfig-network.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Obsoletes: initscripts-legacy <= 9.39
@@ -89,6 +90,7 @@ chmod 600 $RPM_BUILD_ROOT/etc/crypttab
# WRS: Overwrite with our config
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sysctl.conf
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/network
%pre
/usr/sbin/groupadd -g 22 -r -f utmp
@@ -222,6 +224,8 @@ rm -rf $RPM_BUILD_ROOT
%dir /usr/libexec/initscripts/legacy-actions
%ghost %{_localstatedir}/log/dmesg
%ghost %{_localstatedir}/log/dmesg.old
+# WRS
+/etc/sysconfig/network
%files -n debugmode
%defattr(-,root,root)
--
1.9.1

View File

@ -1,44 +0,0 @@
From 9608ef02519db7648cdede4f113e760e4540c0b9 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 06/13] WRS:
0001-Fix-Interfaces-intermittenly-do-not-come-up-on-boot.patch
Conflicts:
SPECS/initscripts.spec
---
SPECS/initscripts.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 5ba669b..63ad994 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
-Release: 1%{?dist}.5
+Release: 1%{?dist}.6
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -48,6 +48,7 @@ Patch4: support-interface-scriptlets.patch
Patch5: relocate-dhclient-leases-to-var-run.patch
Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
Patch7: support-interface-promisc.patch
+Patch8: 0001-dhclient-remove-1-arg.patch
%description
The initscripts package contains basic system scripts used
@@ -72,6 +73,7 @@ Currently, this consists of various memory checking code.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
make
--
1.9.1

View File

@ -1,43 +0,0 @@
From 47c822a4f51caf9cfc782fbf0e6b670b535fe071 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 04/13] WRS: 0001-Support-PROMISC-for-interfaces-config.patch
Conflicts:
SPECS/initscripts.spec
---
SPECS/initscripts.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 6a7a76d..6ec4bea 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
-Release: 1%{?dist}.4
+Release: 1%{?dist}.5
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -44,6 +44,7 @@ Provides: /sbin/service
Patch4: support-interface-scriptlets.patch
Patch5: relocate-dhclient-leases-to-var-run.patch
Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
+Patch7: support-interface-promisc.patch
%description
The initscripts package contains basic system scripts used
@@ -67,6 +68,7 @@ Currently, this consists of various memory checking code.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
make
--
1.9.1

View File

@ -4,25 +4,24 @@ Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 09/13] WRS:
0001-Update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/initscripts.spec
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
---
SPECS/initscripts.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index df59412..fd84a75 100644
index ad32f19..ace1326 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
-Release: 1%{?dist}.8
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
--
1.9.1
1.8.3.1

View File

@ -1,15 +1,4 @@
spec-include-TiS-changes.patch
stop-creating-shared-dirs.patch
0001-Disable-zeroconf-route.patch
0001-Support-PROMISC-for-interfaces-config.patch
spec-add-mountnfs-init-script.patch
0001-Fix-Interfaces-intermittenly-do-not-come-up-on-boot.patch
force-delay-check-link-down.patch
run-ifdown-on-all-interfaces.patch
0001-Update-package-versioning-for-TIS-format.patch
spec-sysconfig-affirmative-check-for-link-carrier.patch
spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch
fix-build-failures-due-to-unwanted-sgid.patch
ipv6-static-route-support.patch
spec-ifup-eth-stop-waiting-if-link-is-up.patch
spec-run-dhclient-as-daemon-for-ipv6.patch
0001-Update-package-versioning-for-TIS-format.patch

View File

@ -3,15 +3,16 @@ From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH] WRS: fix-build-failures-due-to-unwanted-sgid.patch
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
---
SPECS/initscripts.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 938e9bb..e60c826 100644
index 967317f..ad32f19 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -239,7 +239,7 @@ rm -rf $RPM_BUILD_ROOT
@@ -227,7 +227,7 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%ghost %attr(0644,root,root) /etc/sysconfig/kvm
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
@ -21,5 +22,5 @@ index 938e9bb..e60c826 100644
%dir /usr/libexec/initscripts
%dir /usr/libexec/initscripts/legacy-actions
--
2.7.4
1.8.3.1

View File

@ -1,43 +0,0 @@
From 7e75a43284b19d4217d2902adb6f3200bccdf037 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 07/13] WRS: force-delay-check-link-down.patch
Conflicts:
SPECS/initscripts.spec
---
SPECS/initscripts.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 63ad994..c806126 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
-Release: 1%{?dist}.6
+Release: 1%{?dist}.7
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -49,6 +49,7 @@ Patch5: relocate-dhclient-leases-to-var-run.patch
Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
Patch7: support-interface-promisc.patch
Patch8: 0001-dhclient-remove-1-arg.patch
+Patch9: 0001-force-delay-check-link-down.patch
%description
The initscripts package contains basic system scripts used
@@ -74,6 +75,7 @@ Currently, this consists of various memory checking code.
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
make
--
1.9.1

View File

@ -1,33 +0,0 @@
From 2055b5d7ac45920a8bfbdaf31ffe5ab586669664 Mon Sep 17 00:00:00 2001
From: Kevin Smith <kevin.smith@windriver.com>
Date: Wed, 11 Oct 2017 13:20:07 -0500
Subject: [PATCH 1/1] ipv6 static route support
---
SPECS/initscripts.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 090f75c..d15e196 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -53,6 +53,7 @@ Patch9: 0001-force-delay-check-link-down.patch
Patch10: run-ifdown-on-all-interfaces.patch
Patch11: sysconfig-affirmative-check-for-link-carrier.patch
Patch12: sysconfig-unsafe-usage-of-linkdelay-variable.patch
+Patch13: ipv6-static-route-support.patch
%description
The initscripts package contains basic system scripts used
@@ -82,6 +83,8 @@ Currently, this consists of various memory checking code.
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
+
%build
make
--
1.8.3.1

View File

@ -1,43 +0,0 @@
From 32834cbfb6b7186e49416eef5c442ac6f38fd551 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 08/13] WRS: run-ifdown-on-all-interfaces.patch
Conflicts:
SPECS/initscripts.spec
---
SPECS/initscripts.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index c806126..df59412 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.41
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
-Release: 1%{?dist}.7
+Release: 1%{?dist}.8
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -50,6 +50,7 @@ Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
Patch7: support-interface-promisc.patch
Patch8: 0001-dhclient-remove-1-arg.patch
Patch9: 0001-force-delay-check-link-down.patch
+Patch10: run-ifdown-on-all-interfaces.patch
%description
The initscripts package contains basic system scripts used
@@ -76,6 +77,7 @@ Currently, this consists of various memory checking code.
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make
--
1.9.1

View File

@ -1,58 +0,0 @@
From 06e0a487c74c650c261bd09e8e9b27e69c3bae89 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 05/13] WRS: spec-add-mountnfs-init-script.patch
---
SPECS/initscripts.spec | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 6ec4bea..5ba669b 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -11,9 +11,12 @@ Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{
# WRS
Source1: sysctl.conf
Source2: sysconfig-network.conf
+Source3: mountnfs.sh
+Source4: mountnfs.service
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Obsoletes: initscripts-legacy <= 9.39
+Requires: /usr/bin/systemctl
Requires: /bin/awk, sed, coreutils
Requires: /sbin/sysctl
Requires: grep
@@ -94,6 +97,11 @@ chmod 600 $RPM_BUILD_ROOT/etc/crypttab
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sysctl.conf
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/network
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/mountnfs
+
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_unitdir}/mountnfs.service
+
%pre
/usr/sbin/groupadd -g 22 -r -f utmp
@@ -104,6 +112,7 @@ touch /var/log/wtmp /var/run/utmp /var/log/btmp
chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp
chmod 664 /var/log/wtmp /var/run/utmp
chmod 600 /var/log/btmp
+/usr/bin/systemctl enable mountnfs.service > /dev/null 2>&1 || :
/usr/sbin/chkconfig --add network
/usr/sbin/chkconfig --add netconsole
@@ -228,6 +237,8 @@ rm -rf $RPM_BUILD_ROOT
%ghost %{_localstatedir}/log/dmesg.old
# WRS
/etc/sysconfig/network
+/etc/rc.d/init.d/mountnfs
+%{_unitdir}/mountnfs.service
%files -n debugmode
%defattr(-,root,root)
--
1.9.1

View File

@ -1,32 +0,0 @@
From 2a4fe5935b7d9714752119e2a0b296a2d7202cd3 Mon Sep 17 00:00:00 2001
From: Denny Khoerniawan <denny.khoerniawan@windriver.com>
Date: Wed, 15 Nov 2017 14:09:05 -0500
Subject: [PATCH] spec: ifup-eth stop waiting if link is up
---
SPECS/initscripts.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 82c5be0..3adb83f 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -54,6 +54,7 @@ Patch10: run-ifdown-on-all-interfaces.patch
Patch11: sysconfig-affirmative-check-for-link-carrier.patch
Patch12: sysconfig-unsafe-usage-of-linkdelay-variable.patch
Patch13: ipv6-static-route-support.patch
+Patch14: ifup-eth-stop-waiting-if-link-is-up.patch
%description
The initscripts package contains basic system scripts used
@@ -84,6 +85,7 @@ Currently, this consists of various memory checking code.
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
%build
--
1.8.3.1

View File

@ -3,59 +3,55 @@ From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH] WRS: spec-include-TiS-changes.patch
Conflicts:
SPECS/initscripts.spec
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
---
SPECS/initscripts.spec | 15 +++++++++++++++
1 file changed, 15 insertions(+)
SPECS/initscripts.spec | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index e96290a..665b576 100644
index e96290a..d3c2ce6 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -7,6 +7,10 @@ Group: System Environment/Base
Release: 1%{?dist}
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+# WRS
+Source1: sysctl.conf
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Obsoletes: initscripts-legacy <= 9.39
Requires: /bin/awk, sed, coreutils
@@ -36,6 +40,10 @@ Requires(preun): /sbin/chkconfig
@@ -36,6 +36,19 @@ Requires(preun): /sbin/chkconfig
BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd
Provides: /sbin/service
+Patch4: support-interface-scriptlets.patch
+Patch5: relocate-dhclient-leases-to-var-run.patch
+Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
+Patch1: support-interface-scriptlets.patch
+Patch2: relocate-dhclient-leases-to-var-run.patch
+Patch3: dhclient-restrict-interfaces-to-those-on-c.patch
+Patch4: support-interface-promisc.patch
+Patch5: 0001-dhclient-remove-1-arg.patch
+Patch6: 0001-force-delay-check-link-down.patch
+Patch7: run-ifdown-on-all-interfaces.patch
+Patch8: sysconfig-affirmative-check-for-link-carrier.patch
+Patch9: sysconfig-unsafe-usage-of-linkdelay-variable.patch
+Patch10: ipv6-static-route-support.patch
+Patch11: ifup-eth-stop-waiting-if-link-is-up.patch
+Patch12: run-dhclient-as-daemon-for-ipv6.patch
+
%description
The initscripts package contains basic system scripts used
during a boot of the system. It also contains scripts which
@@ -55,6 +63,10 @@ Currently, this consists of various memory checking code.
@@ -55,6 +68,19 @@ Currently, this consists of various memory checking code.
%prep
%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+
%build
make
@@ -75,6 +87,9 @@ rm -f \
touch $RPM_BUILD_ROOT/etc/crypttab
chmod 600 $RPM_BUILD_ROOT/etc/crypttab
+# WRS: Overwrite with our config
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sysctl.conf
+
%pre
/usr/sbin/groupadd -g 22 -r -f utmp
--
2.7.4
1.8.3.1

View File

@ -1,32 +0,0 @@
From 6c9a61e5ff22f2834dcc5ab91d32b370ef6a878c Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Fri, 22 Dec 2017 15:01:11 -0500
Subject: [PATCH] spec: run dhclient as daemon for ipv6
---
SPECS/initscripts.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 3adb83f..1ab8bb2 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -55,6 +55,7 @@ Patch11: sysconfig-affirmative-check-for-link-carrier.patch
Patch12: sysconfig-unsafe-usage-of-linkdelay-variable.patch
Patch13: ipv6-static-route-support.patch
Patch14: ifup-eth-stop-waiting-if-link-is-up.patch
+Patch15: run-dhclient-as-daemon-for-ipv6.patch
%description
The initscripts package contains basic system scripts used
@@ -86,6 +87,7 @@ Currently, this consists of various memory checking code.
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
%build
--
1.8.3.1

View File

@ -1,33 +0,0 @@
From 55e24310e0c7c9027d7b3c5d232e28988daebce9 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 10/13] WRS:
spec-sysconfig-affirmative-check-for-link-carrier.patch
---
SPECS/initscripts.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index fd84a75..e3748e5 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -51,6 +51,7 @@ Patch7: support-interface-promisc.patch
Patch8: 0001-dhclient-remove-1-arg.patch
Patch9: 0001-force-delay-check-link-down.patch
Patch10: run-ifdown-on-all-interfaces.patch
+Patch11: sysconfig-affirmative-check-for-link-carrier.patch
%description
The initscripts package contains basic system scripts used
@@ -78,6 +79,7 @@ Currently, this consists of various memory checking code.
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%build
make
--
1.9.1

View File

@ -1,33 +0,0 @@
From 7d7f3dc174164989d47cb103a766e68f818f5f64 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 11/13] WRS:
spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch
---
SPECS/initscripts.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index e3748e5..f2d0271 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -52,6 +52,7 @@ Patch8: 0001-dhclient-remove-1-arg.patch
Patch9: 0001-force-delay-check-link-down.patch
Patch10: run-ifdown-on-all-interfaces.patch
Patch11: sysconfig-affirmative-check-for-link-carrier.patch
+Patch12: sysconfig-unsafe-usage-of-linkdelay-variable.patch
%description
The initscripts package contains basic system scripts used
@@ -80,6 +81,7 @@ Currently, this consists of various memory checking code.
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%build
make
--
1.9.1

View File

@ -3,15 +3,16 @@ From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 02/13] WRS: stop-creating-shared-dirs.patch
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
---
SPECS/initscripts.spec | 6 ------
1 file changed, 6 deletions(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 7f93a30..5349c54 100644
index d3c2ce6..967317f 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -178,10 +178,7 @@ rm -rf $RPM_BUILD_ROOT
@@ -189,10 +189,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/lib/systemd/rhel-*
/usr/lib/systemd/system/*
/etc/inittab
@ -22,7 +23,7 @@ index 7f93a30..5349c54 100644
/etc/rc.d/init.d/*
%config(noreplace) /etc/sysctl.conf
/usr/lib/sysctl.d/00-system.conf
@@ -203,7 +200,6 @@ rm -rf $RPM_BUILD_ROOT
@@ -214,7 +211,6 @@ rm -rf $RPM_BUILD_ROOT
/usr/sbin/ppp-watch
%{_mandir}/man*/*
%dir %attr(775,root,root) /var/run/netreport
@ -30,7 +31,7 @@ index 7f93a30..5349c54 100644
%dir /etc/ppp/peers
/etc/ppp/ip-up
/etc/ppp/ip-down
@@ -211,8 +207,6 @@ rm -rf $RPM_BUILD_ROOT
@@ -222,8 +218,6 @@ rm -rf $RPM_BUILD_ROOT
/etc/ppp/ip-down.ipv6to4
/etc/ppp/ipv6-up
/etc/ppp/ipv6-down
@ -40,5 +41,5 @@ index 7f93a30..5349c54 100644
%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING
%doc examples
--
1.9.1
1.8.3.1

View File

@ -164,6 +164,7 @@ build-info
# initscripts
initscripts
initscripts-config
# setup
setup

View File

@ -1,5 +1,6 @@
tools/vm-topology
base/initscripts
base/initscripts-config
base/util-linux
base/setup
utilities/namespace-utils

View File

@ -8,7 +8,8 @@ Packager: Wind River <info@windriver.com>
URL: unknown
BuildArch: noarch
Source: %name-%version.tar.gz
#Requires: /usr/bin/perl
Requires: initscripts-config
%description
This package contains data collection tools to monitor host performance.