From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH zfsonlinux 3/5] usr-merge: synchronize debian/ with upstream
Date: Tue, 27 May 2025 18:12:41 +0200 [thread overview]
Message-ID: <20250527161243.918116-4-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20250527161243.918116-1-s.ivanov@proxmox.com>
minor changes found by `diff -ru` on debian/ with the one in
debian-upstream
based on https://salsa.debian.org/zfsonlinux-team/zfs/
commits: 3b029ca123417535a53efa23f54975649924c66c
3b029ca123417535a53efa23f54975649924c66c
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
debian/libzfslinux-dev.install.in | 2 +-
.../usr/share/initramfs-tools/hooks/zdev | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/libzfslinux-dev.install.in b/debian/libzfslinux-dev.install.in
index c286cc327..9b14b6f27 100644
--- a/debian/libzfslinux-dev.install.in
+++ b/debian/libzfslinux-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/@DEB_HOST_MULTIARCH@/*.a
usr/include
usr/lib/@DEB_HOST_MULTIARCH@/*.so
/usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc
diff --git a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
index 0cf21a421..a1aa39ac0 100755
--- a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
+++ b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
@@ -5,7 +5,7 @@
PREREQ="udev"
PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules"
-COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id"
+COPY_EXEC_LIST="/usr/lib/udev/zvol_id /usr/lib/udev/vdev_id"
# Generic result code.
RC=0
@@ -33,18 +33,18 @@ fi
. /usr/share/initramfs-tools/hook-functions
-mkdir -p "$DESTDIR/lib/udev/rules.d/"
+mkdir -p "$DESTDIR/usr/lib/udev/rules.d/"
for ii in $PREREQ_UDEV_RULES
do
if [ -e "/etc/udev/rules.d/$ii" ]
then
- cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
- elif [ -e "/lib/udev/rules.d/$ii" ]
+ cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/usr/lib/udev/rules.d/"
+ elif [ -e "/usr/lib/udev/rules.d/$ii" ]
then
- cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
+ cp -p "/usr/lib/udev/rules.d/$ii" "$DESTDIR/usr/lib/udev/rules.d/"
else
echo "Error: Missing udev rule: $ii"
- echo " This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory."
+ echo " This file must be in the /etc/udev/rules.d or /usr/lib/udev/rules.d directory."
exit 1
fi
done
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-05-27 16:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-27 16:12 [pve-devel] [PATCH zfsonlinux 0/5] port some changes from salsa.d.o Stoiko Ivanov
2025-05-27 16:12 ` [pve-devel] [PATCH zfsonlinux 1/5] cherry-pick usr-merge fix for libzfs6linux Stoiko Ivanov
2025-05-27 16:12 ` [pve-devel] [PATCH zfsonlinux 2/5] d/: move some tools out of /usr/sbin and add links for compatibility Stoiko Ivanov
2025-05-27 16:12 ` Stoiko Ivanov [this message]
2025-05-27 16:12 ` [pve-devel] [PATCH zfsonlinux 4/5] d/control: record conflict with nordugrid-arc-client Stoiko Ivanov
2025-05-27 16:12 ` [pve-devel] [PATCH zfsonlinux 5/5] d/lintian-overrides: adapt to renamed tags Stoiko Ivanov
2025-06-02 14:24 ` [pve-devel] applied-series: [PATCH zfsonlinux 0/5] port some changes from salsa.d.o Fabian Grünbichler
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=20250527161243.918116-4-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal