From: LaszloGombos <LaszloGombos@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] dracut: move network-legacy into dracut-network package
Date: Tue, 13 Dec 2022 21:10:23 +0100 [thread overview]
Message-ID: <20221213201023._mGFnuisUCuUcVIzJNMSa-lCYBVahKy4nymtFdXtlo8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41031@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 771 bytes --]
There is an updated pull request by LaszloGombos against master on the void-packages repository
https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/41031
dracut: move network-legacy into dracut-network package
Other changes:
- remove more systemd dependent modules
- network-manager module depends on the dbus dracut module, which in turn depends on the systemd dracut module
#### Testing the changes
- I tested the changes in this PR: **NO**
In case it helps to test and review - alpine dracut package has some similar changes - https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/dracut/APKBUILD#L35
A patch file from https://github.com/void-linux/void-packages/pull/41031.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41031.patch --]
[-- Type: text/x-diff, Size: 3350 bytes --]
From 1210aa243036a0ddde9946921c37af46dbcf26c6 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Mon, 12 Dec 2022 05:17:53 +0000
Subject: [PATCH 1/2] dracut: move network-legacy into dracut-network package
Other changes:
- remove more systemd dependent modules
- network-manager module depends on the dbus dracut module,
which in turn depends on the systemd dracut module
---
srcpkgs/dracut/template | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 001a4c52c023..bdc5cf2ef560 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -2,7 +2,7 @@
pkgname=dracut
reverts="056_1"
version=053
-revision=5
+revision=6
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -44,6 +44,14 @@ post_install() {
# We don't need the systemd stuff.
rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*systemd*
+
+ # systemd dependent additional dracut modules
+ rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*bluetooth
+ rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*connman
+ rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*dbus*
+ rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*network-manager
+ rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*network-wicked
+
rm -f ${DESTDIR}/usr/share/man/man8/*.service.*
rm -rf ${DESTDIR}/usr/lib/kernel
}
@@ -52,7 +60,7 @@ dracut-network_package() {
depends="dhclient ${sourcepkg}-${version}_${revision}"
short_desc+=" - network modules"
pkg_install() {
- for f in 40network 90livenet 95fcoe 95iscsi \
+ for f in 35network-legacy 40network 90livenet 95fcoe 95iscsi \
95nbd 95nfs 95zfcp 95znet; do
vmove usr/lib/dracut/modules.d/${f}
done
From 7252bf1e4dff407f7c0afbb70fd955a02729916d Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Tue, 13 Dec 2022 15:10:21 -0500
Subject: [PATCH 2/2] Update srcpkgs/dracut/template
Co-authored-by: Michal Vasilek <michal@vasilek.cz>
---
srcpkgs/dracut/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index bdc5cf2ef560..8571d7db413e 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -43,17 +43,17 @@ post_install() {
vinstall ${FILESDIR}/kernel-hook-postrm 755 usr/libexec/dracut
# We don't need the systemd stuff.
- rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*systemd*
+ rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*systemd*
# systemd dependent additional dracut modules
- rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*bluetooth
- rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*connman
- rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*dbus*
- rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*network-manager
- rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*network-wicked
+ rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*bluetooth
+ rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*connman
+ rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*dbus*
+ rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*network-manager
+ rm -r ${DESTDIR}/usr/lib/dracut/modules.d/*network-wicked
- rm -f ${DESTDIR}/usr/share/man/man8/*.service.*
- rm -rf ${DESTDIR}/usr/lib/kernel
+ rm ${DESTDIR}/usr/share/man/man8/*.service.*
+ rm -r ${DESTDIR}/usr/lib/kernel
}
dracut-network_package() {
next prev parent reply other threads:[~2022-12-13 20:10 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 5:24 [PR PATCH] " LaszloGombos
2022-12-13 3:48 ` LaszloGombos
2022-12-13 3:55 ` ahesford
2022-12-13 18:44 ` [PR REVIEW] " paper42
2022-12-13 20:10 ` LaszloGombos [this message]
2022-12-13 23:02 ` [PR PATCH] [Updated] " LaszloGombos
2022-12-13 23:59 ` LaszloGombos
2022-12-14 23:48 ` LaszloGombos
2022-12-15 11:44 ` LaszloGombos
2022-12-15 13:34 ` LaszloGombos
2022-12-15 13:55 ` LaszloGombos
2022-12-18 20:01 ` LaszloGombos
2022-12-18 23:17 ` LaszloGombos
2022-12-20 14:53 ` LaszloGombos
2022-12-23 18:21 ` LaszloGombos
2023-01-04 2:40 ` LaszloGombos
2023-01-06 15:13 ` zdykstra
2023-01-17 13:08 ` [PR PATCH] [Merged]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221213201023._mGFnuisUCuUcVIzJNMSa-lCYBVahKy4nymtFdXtlo8@z \
--to=laszlogombos@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).