systemd: split out to multiple packages and upgrade to 247 stable

Fix uded hot plug rules ``` May 22 23:07:41 photon-machine systemd-udevd[192]: cpu0: /etc/udev/rules.d/99-vmware-hotplug.rules:6 Failed to write ATTR{/sys/devices/system/cpu/cpu0/online}, ignoring: No such file or directory ``` Change-Id: I025a2ef2d23fff0a44ac7cca02be652ee909d324 Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/10145 Tested-by: gerrit-photon <[email protected]> Reviewed-by: Tapas Kundu <[email protected]>
ailen0ada · Dec 15, 2020 · a45683c · a45683c
1 parent e05ee73
commit a45683c
Show file tree

Hide file tree

Showing 14 changed files with 508 additions and 122 deletions.
diff --git a/SPECS/ModemManager/ModemManager.spec b/SPECS/ModemManager/ModemManager.spec
@@ -1,7 +1,7 @@
 Summary:        Mobile broadband modem manager
 Name:           ModemManager
 Version:        1.14.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            https://www.freedesktop.org
 License:        GPLv2
 Group:          Applications/System
@@ -11,10 +11,19 @@ Source0:        https://www.freedesktop.org/software/ModemManager/ModemManager-%
 %define sha1    ModemManager=07e36664c9effa548b6d58cd7d7dce5da10a16ca
 BuildRequires:  libqmi-devel
 BuildRequires:  gobject-introspection-devel
+BuildRequires:  libgudev-devel
+BuildRequires:  systemd-devel
+BuildRequires:  systemd-libs
+BuildRequires:  gcc
+BuildRequires:  pkg-config
+BuildRequires:  automake autoconf libtool
 BuildRequires:  libxslt
+
 %if %{with_check}
 BuildRequires:  dbus-devel
 %endif
+
+Requires:       libgudev
 Requires:       libqmi
 Requires:       gobject-introspection
 %description
@@ -55,6 +64,7 @@ make %{?_smp_mflags} check
 %{_libdir}/libmm-glib.so*
 %{_libdir}/girepository-1.0/ModemManager-1.0.typelib
 %{_libdir}/ModemManager/*
+%{_libdir}/systemd/system/ModemManager.service
 %exclude %{_libdir}/debug
 %{_mandir}/man1/mmcli.1.gz
 %{_mandir}/man8/ModemManager.8.gz
@@ -73,6 +83,8 @@ make %{?_smp_mflags} check
 %{_libdir}/libmm-glib.la
 
 %changelog
+*   Mon Dec 14 2020 Susant Sahani <[email protected]> 1.14.2-3
+-   Add build requires
 *   Wed Nov 18 2020 Satya Naga Vasamsetty <[email protected]> 1.14.2-2
 -   Fix make check
 *   Mon Aug 24 2020 Gerrit Photon <[email protected]> 1.14.2-1

diff --git a/SPECS/dbus-glib/dbus-glib.spec b/SPECS/dbus-glib/dbus-glib.spec
@@ -1,18 +1,23 @@
-Summary:	Glib interfaces to D-Bus API 
-Name:		dbus-glib
-Version:	0.110
-Release:	1%{?dist}
-License: 	AFL and GPLv2+
-Group: 		System Environment/Libraries
-Source0:	http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
+Summary:        Glib interfaces to D-Bus API
+Name:           dbus-glib
+Version:        0.110
+Release:        2%{?dist}
+License:        AFL and GPLv2+
+Group:          System Environment/Libraries
+Source0:        http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
 %define sha1 dbus-glib=998b7c762c8f18c906f19fc393bb8712eabe8c97
-Vendor:		VMware, Inc.
-Distribution:	Photon
+Vendor:         VMware, Inc.
+Distribution:   Photon
+
 BuildRequires:	glib-devel
 BuildRequires:	dbus-devel
-Requires:	glib
-Requires:	dbus
-Provides:	pkgconfig(dbus-glib-1)
+BuildRequires:	systemd-devel
+
+Requires:       glib
+Requires:       dbus
+Requires:       libffi
+Requires:       systemd
+Provides:       pkgconfig(dbus-glib-1)
 
 %description
 The D-Bus GLib package contains GLib interfaces to the D-Bus API.
@@ -29,12 +34,10 @@ Headers and static libraries for the D-Bus GLib bindings
 %prep
 %setup -q
 %build
-./configure \
-	--prefix=%{_prefix} \
-	--sysconfdir=%{_sysconfdir} \
-        --disable-static \
-	--disable-gtk-doc
-
+%configure                   \
+  --disable-static            \
+  --disable-gtk-doc
+
 make %{?_smp_mflags}
 %install
 make DESTDIR=%{buildroot} install
@@ -44,7 +47,7 @@ make %{?_smp_mflags} check
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
-%files 
+%files
 %defattr(-,root,root)
 %{_sysconfdir}/bash_completion.d/*
 %{_bindir}/*
@@ -60,22 +63,22 @@ make %{?_smp_mflags} check
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
-
-
 %changelog
+*	Mon Dec 14 2020 Susant Sahani<[email protected]> 0.110-2
+- Add build requres and requires.
 *	Mon Sep 10 2018 Ajay Kaher <[email protected]> 0.110-1
--       Upgraded to 0.110
-*       Wed May 03 2017 Bo Gan <[email protected]> 0.108-1
--       Update to 0.108
-*       Wed Oct 05 2016 ChangLee <[email protected]> 0.106-5
--       Modified %check
+- Upgraded to 0.110
+* Wed May 03 2017 Bo Gan <[email protected]> 0.108-1
+- Update to 0.108
+* Wed Oct 05 2016 ChangLee <[email protected]> 0.106-5
+- Modified %check
 *	Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 0.106-4
 -	GA - Bump release of all rpms
-*   Mon Feb 22 2016 XIaolin Li <[email protected]> 0.106-1
--   Updated to version 0.106
-*   	Thu Jan 28 2016 Anish Swaminathan <[email protected]> 0.104-3
--   	Add requires to dbus-glib-devel
-* 	Tue Sep 22 2015 Harish Udaiya Kumar <[email protected]> 0.104-2
+* Mon Feb 22 2016 XIaolin Li <[email protected]> 0.106-1
+- Updated to version 0.106
+* Thu Jan 28 2016 Anish Swaminathan <[email protected]> 0.104-3
+- Add requires to dbus-glib-devel
+* Tue Sep 22 2015 Harish Udaiya Kumar <[email protected]> 0.104-2
 -	Updated build requires after creating devel package for dbus
 *	Tue Jun 23 2015 Divya Thaluru <[email protected]> 0.104-1
 -	Initial build.
diff --git a/SPECS/dbus-python/dbus-python.spec b/SPECS/dbus-python/dbus-python.spec
@@ -3,22 +3,25 @@
 
 Name:           dbus-python3
 Version:        1.2.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for D-Bus
 License:        MIT
 Group:          Development/Libraries/Python
 Url:            http://www.freedesktop.org/wiki/Software/DBusBindings/
 Source0:        http://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz
 %define         sha1 dbus-python=de05308c75baa2ce5434de73d60428c005ac0cc1
-Vendor:		VMware, Inc.
-Distribution:	Photon
+Vendor:         VMware, Inc.
+Distribution:   Photon
+
 BuildRequires:  python3
 BuildRequires:  python3-devel
 BuildRequires:  python3-libs
 BuildRequires:  python3-docutils
 BuildRequires:  dbus-devel
 BuildRequires:  glib-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  systemd-devel
+
 Requires:       python3-xml
 Requires:       dbus
 
@@ -64,5 +67,7 @@ make check
 %{_libdir}/pkgconfig/dbus-python.pc
 
 %changelog
+*   Mon Dec 14 2020 Susant Sahani <[email protected]> 1.2.16-2
+-   Add build requires
 *   Thu Mar 19 2020 Tapas Kundu <[email protected]> 1.2.16-1
 -   Initial release
diff --git a/SPECS/libmbim/libmbim.spec b/SPECS/libmbim/libmbim.spec
@@ -1,7 +1,7 @@
 Summary:        Library for talking to WWAN modems and devices
 Name:           libmbim
 Version:        1.24.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            https://www.freedesktop.org
 License:        GPLv2
 Group:          Applications/System
@@ -10,7 +10,17 @@ Distribution:   Photon
 Source0:        https://www.freedesktop.org/software/libmbim/libmbim-%{version}.tar.xz
 %define sha1    libmbim=1162a4302be250ca3334f3bfd1e7d04770e4b4ff
 BuildRequires:  libgudev-devel
+BuildRequires:  libgudev
+BuildRequires:  systemd-devel
+BuildRequires:  systemd-libs
+BuildRequires:  python3
+BuildRequires:  gcc
+BuildRequires:  glib-devel
+BuildRequires:  pkg-config
+BuildRequires:  automake autoconf libtool
+
 Requires:       libgudev
+
 %description
 The libmbim package contains a GLib-based library for talking to WWAN modems
 and devices which speak the Mobile Interface Broadband Model (MBIM) protocol.
@@ -23,7 +33,7 @@ Requires:      libgudev-devel
 It contains the libraries and header files for libmbim
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure --disable-static
@@ -55,6 +65,8 @@ make  %{?_smp_mflags} check
 %{_datadir}/gtk-doc/*
 
 %changelog
+*   Mon Dec 14 2020 Susant Sahani<[email protected]> 1.24.2-2
+-   Add build requires
 *   Wed Jul 08 2020 Gerrit Photon <[email protected]> 1.24.2-1
 -   Automatic Version Bump
 *   Mon Dec 10 2018 Alexey Makhalov <[email protected]> 1.16.2-1

diff --git a/SPECS/libqmi/libqmi.spec b/SPECS/libqmi/libqmi.spec
@@ -1,7 +1,7 @@
 Summary:        Library for talking to WWAN modems and devices
 Name:           libqmi
 Version:        1.26.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            https://www.freedesktop.org
 License:        GPLv2
 Group:          Applications/System
@@ -10,7 +10,15 @@ Distribution:   Photon
 Source0:        https://www.freedesktop.org/software/libqmi/libqmi-%{version}.tar.xz
 %define sha1    libqmi=f42a4100d00f20bdee9e4137fa7de143729be41d
 BuildRequires:  libmbim-devel
+BuildRequires:  libgudev-devel
+BuildRequires:  systemd-devel
+BuildRequires:  systemd-libs
+BuildRequires:  gcc
+BuildRequires:  pkg-config
+BuildRequires:  automake autoconf libtool
+
 Requires:       libmbim
+Requires:       libgudev
 %description
 The libqmi package contains a GLib-based library for talking to WWAN modems
 and devices which speak the Qualcomm MSM Interface (QMI) protocol.
@@ -56,6 +64,8 @@ make  %{?_smp_mflags} check
 %{_datadir}/gtk-doc/*
 
 %changelog
+*   Mon Dec 14 2020 Susant Sahani <[email protected]> 1.26.4-2
+-   Add build requires
 *   Wed Sep 09 2020 Gerrit Photon <[email protected]> 1.26.4-1
 -   Automatic Version Bump
 *   Wed Jul 08 2020 Gerrit Photon <[email protected]> 1.26.2-1

diff --git a/SPECS/minimal/minimal.spec b/SPECS/minimal/minimal.spec
@@ -1,48 +1,56 @@
 Name:           minimal
 Summary:        Metapackage to install minimal profile
 Version:        0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        Apache 2.0
 Group:          System Environment/Base
 URL:            https://vmware.github.io/photon/
 Vendor:         VMware, Inc.
 Distribution:   Photon
-Requires:       filesystem
-Requires:	grub2-theme
-Requires:	grub2-efi-image
-Requires:       pkg-config
-Requires:       bzip2
-Requires:       procps-ng
-Requires:       iana-etc
+
 Requires:       bc
-Requires:       libtool
-Requires:       net-tools
+Requires:       bridge-utils
+Requires:       bzip2
+Requires:       cloud-init
+Requires:       cpio
+Requires:       cracklib-dicts
+Requires:       dbus
+Requires:       docker
+Requires:       e2fsprogs
+Requires:       file
+Requires:       filesystem
 Requires:       findutils
+Requires:       gdbm
+Requires:       grep
+Requires:       grub2-efi-image
+Requires:       grub2-theme
+Requires:       gzip
+Requires:       iana-etc
 Requires:       iproute2
 Requires:       iptables
 Requires:       iputils
-Requires:       dbus
-Requires:       file
-Requires:       e2fsprogs
-Requires:       rpm
+Requires:       Linux-PAM
+Requires:       libtool
+Requires:       motd
+Requires:       net-tools
 Requires:       openssh
-Requires:       gdbm
 Requires:       photon-release
 Requires:       photon-repos
+Requires:       pkg-config
+Requires:       procps-ng
+Requires:       rpm
 Requires:       sed
-Requires:       grep
-Requires:       util-linux
-Requires:       cpio
-Requires:       gzip
-Requires:       vim
+Requires:       systemd
+Requires:       systemd-libs
+Requires:       systemd-pam
+Requires:       systemd-rpm-macros
+Requires:       systemd-udev
 Requires:       tdnf
-Requires:       docker
-Requires:       bridge-utils
-Requires:       cloud-init
 Requires:       tzdata
+Requires:       util-linux
+Requires:       vim
 Requires:       which
-Requires:       motd
-Requires:       cracklib-dicts
+
 %ifarch x86_64
 Requires:       open-vm-tools
 %endif
@@ -58,6 +66,8 @@ Metapackage to install minimal profile
 %defattr(-,root,root,0755)
 
 %changelog
+*   Mon Aug 17 2020 Susant Sahani <[email protected]> 0.1-4
+-   Add systemd packages, sort requires packages in alphabetical order
 *   Thu Mar 12 2020 Alexey Makhalov <[email protected]> 0.1-3
 -   Add grub2 packages
 *   Thu Nov 15 2018 Alexey Makhalov <[email protected]> 0.1-2

diff --git a/SPECS/systemd/99-vmware-hotplug.rules b/SPECS/systemd/99-vmware-hotplug.rules
@@ -2,6 +2,7 @@
 # VMware HotPlug automatization
 #
 # Automatically bring on-line added processors and memory.
-# 
-ACTION=="add", SUBSYSTEM=="cpu", ATTR{online}="1"
-SUBSYSTEM=="memory", ACTION=="add", DEVPATH=="/devices/system/memory/memory*[0-9]", TEST=="state", ATTR{state}="online"
+#
+
+SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
+SUBSYSTEM=="memory", ACTION=="add", TEST=="state", ATTR{state}=="offline", ATTR{state}="online"
diff --git a/SPECS/systemd/systemd-245-default-dns-from-env.patch b/SPECS/systemd/systemd-245-default-dns-from-env.patch
diff --git a/SPECS/systemd/systemd-247-default-dns-from-env.patch b/SPECS/systemd/systemd-247-default-dns-from-env.patch
@@ -0,0 +1,12 @@
+diff --color -rupN systemd-stable-246.1/src/resolve/resolved-conf.c systemd-stable-246.1-default-dns-from-env/src/resolve/resolved-conf.c
+--- systemd-stable-246.1/src/resolve/resolved-conf.c	2020-08-07 15:09:53.000000000 +0000
++++ systemd-stable-246.1-default-dns-from-env/src/resolve/resolved-conf.c	2020-08-12 20:17:47.199127027 +0000
+@@ -402,7 +402,7 @@ int manager_parse_config_file(Manager *m
+                 return r;
+
+         if (m->need_builtin_fallbacks) {
+-                r = manager_parse_dns_server_string_and_warn(m, DNS_SERVER_FALLBACK, DNS_SERVERS);
++                r = manager_parse_dns_server_string_and_warn(m, DNS_SERVER_FALLBACK, secure_getenv("DEFAULT_DNS_SERVERS") ?: DNS_SERVERS);
+                 if (r < 0)
+                         return r;
+         }