Attachment 7342 Details for Bug 34398 – remap device

[patch] remap device

0001-remap-device-ID-ALT-34398.patch (text/plain), 1.25 KB, created by Vladimir D. Seleznev on 2018-01-05 03:02:38 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir D. Seleznev

Created: 2018-01-05 03:02:38 MSK

Size: 1.25 KB

patch

obsolete

>From 47aa8fd9e6afe6f8e35439e3dcecc79b98cee5d1 Mon Sep 17 00:00:00 2001
>From: "Vladimir D. Seleznev" <vseleznv@altlinux.org>
>Date: Fri, 5 Jan 2018 01:24:31 +0300
>Subject: [PATCH 1/2] remap device ID (ALT#34398)
>
>Based on rpm.org commit 959dedc5ae6ae493365565eb4029dea2a34be047
>
>Signed-off-by: Vladimir D. Seleznev <vseleznv@altlinux.org>
>---
> build/files.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
>diff --git a/build/files.c b/build/files.c
>index 990155f..e39ebd3 100644
>--- a/build/files.c
>+++ b/build/files.c
>@@ -1144,14 +1144,12 @@ static void genCpioListAndHeader(Spec spec, /*@partial@*/ FileList fl,
> 	(void) headerAddOrAppendEntry(h, RPMTAG_FILERDEVS, RPM_INT16_TYPE,
> 			       &(flp->fl_rdev), 1);
>       }
>-      if (sizeof(flp->fl_dev) != sizeof(uint_32)) {
>-	uint_32 pdevice = (uint_32)flp->fl_dev;
>+      {
>+	uint_32 pdevice = flp->fl_dev ? 1 : 0;
> 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEDEVICES, RPM_INT32_TYPE,
> 			       &(pdevice), 1);
>-      } else {
>-	(void) headerAddOrAppendEntry(h, RPMTAG_FILEDEVICES, RPM_INT32_TYPE,
>-			       &(flp->fl_dev), 1);
>       }
>+
>       if (sizeof(flp->fl_ino) != sizeof(uint_32)) {
> 	uint_32 ino = (uint_32)flp->fl_ino;
> 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEINODES, RPM_INT32_TYPE,
>-- 
>2.10.4
>

Actions: View | Diff

Attachments on bug 34398: 7342 | 7343