From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id BBCA31FF16F for <inbox@lore.proxmox.com>; Tue, 27 May 2025 18:12:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 52FB31B9A3; Tue, 27 May 2025 18:13:05 +0200 (CEST) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pve-devel@lists.proxmox.com Date: Tue, 27 May 2025 18:12:41 +0200 Message-Id: <20250527161243.918116-4-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250527161243.918116-1-s.ivanov@proxmox.com> References: <20250527161243.918116-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.063 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_SHORT 0.001 Use of a URL Shortener for very short URL SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH zfsonlinux 3/5] usr-merge: synchronize debian/ with upstream X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.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