1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
diff -dPNur mkinitrd-6.0.93-orig/bdevid/python/Makefile mkinitrd-6.0.93/bdevid/python/Makefile
--- mkinitrd-6.0.93-orig/bdevid/python/Makefile 2019-10-25 20:25:33.733753651 +0200
+++ mkinitrd-6.0.93/bdevid/python/Makefile 2019-10-25 20:39:23.029000459 +0200
@@ -25,7 +25,7 @@
include $(TOPDIR)/Makefile.inc
SITELIB := $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")
-PYVER := $(shell python -c "import sys; print sys.version[0:3]")
+PYVER := $(shell python2 -c "import sys; print (sys.version[0:3])")
CFLAGS += -I/usr/include/python$(PYVER)
CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include
LDFLAGS = -shared -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid
diff -dPNur mkinitrd-6.0.93-orig/bdevid/sysfs.c mkinitrd-6.0.93/bdevid/sysfs.c
--- mkinitrd-6.0.93-orig/bdevid/sysfs.c 2009-09-02 10:41:45.000000000 +0200
+++ mkinitrd-6.0.93/bdevid/sysfs.c 2019-10-25 20:36:16.444012869 +0200
@@ -30,6 +30,8 @@
#include <errno.h>
#include <unistd.h>
+#include <sys/sysmacros.h>
+
#include <nash.h>
#include "bdevid.h"
diff -dPNur mkinitrd-6.0.93-orig/nash/block.c mkinitrd-6.0.93/nash/block.c
--- mkinitrd-6.0.93-orig/nash/block.c 2019-10-25 20:25:31.293714823 +0200
+++ mkinitrd-6.0.93/nash/block.c 2019-10-25 20:34:13.839051611 +0200
@@ -36,8 +36,8 @@
#include <envz.h>
#include <blkid/blkid.h>
-
#include <linux/blkpg.h>
+#include <sys/sysmacros.h>
#include <nash.h>
#include "lib.h"
diff -dPNur mkinitrd-6.0.93-orig/nash/devtree.c mkinitrd-6.0.93/nash/devtree.c
--- mkinitrd-6.0.93-orig/nash/devtree.c 2019-10-25 20:25:32.020726392 +0200
+++ mkinitrd-6.0.93/nash/devtree.c 2019-10-25 20:34:54.382699987 +0200
@@ -26,6 +26,7 @@
#include <string.h>
#include <errno.h>
#include <ctype.h>
+#include <sys/sysmacros.h>
#include <nash.h>
#include "list.h"
diff -dPNur mkinitrd-6.0.93-orig/nash/dm.c mkinitrd-6.0.93/nash/dm.c
--- mkinitrd-6.0.93-orig/nash/dm.c 2019-10-25 20:25:31.514718340 +0200
+++ mkinitrd-6.0.93/nash/dm.c 2019-10-25 20:33:20.023191276 +0200
@@ -30,6 +30,7 @@
#include <libdevmapper.h>
#include <parted/parted.h>
+#include <sys/sysmacros.h>
#include <nash.h>
diff -dPNur mkinitrd-6.0.93-orig/nash/Makefile mkinitrd-6.0.93/nash/Makefile
--- mkinitrd-6.0.93-orig/nash/Makefile 2019-10-25 20:25:33.724753507 +0200
+++ mkinitrd-6.0.93/nash/Makefile 2019-10-25 20:29:45.448764596 +0200
@@ -31,7 +31,7 @@
include ../Makefile.inc
-CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include
+CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include -I/usr/include/tirpc
LDFLAGS += -Wl,-rpath-link,$(TOPDIR)/bdevid:$(TOPDIR)/nash
@@ -39,6 +39,7 @@
nash_LIBS += -ldevmapper -lparted -lblkid
nash_LIBS += -luuid -lpopt -lresolv -ldl -lelf
nash_LIBS += -lm
+nash_LIBS += -ltirpc
# We need to link against libgcc_s directly, or it'll /dlopen() it during
# backtrace()! This is not teh way!!!1!!!one!!!.
nash_LIBS += -lgcc_s
diff -dPNur mkinitrd-6.0.93-orig/nash/nash.c mkinitrd-6.0.93/nash/nash.c
--- mkinitrd-6.0.93-orig/nash/nash.c 2019-10-25 20:25:32.636736194 +0200
+++ mkinitrd-6.0.93/nash/nash.c 2019-10-25 20:28:32.810606074 +0200
@@ -60,6 +60,7 @@
#include <argz.h>
#include <asm/unistd.h>
#include <linux/fs.h>
+#include <sys/sysmacros.h>
#include <libdevmapper.h>
diff -dPNur mkinitrd-6.0.93-orig/nash/procdev.c mkinitrd-6.0.93/nash/procdev.c
--- mkinitrd-6.0.93-orig/nash/procdev.c 2009-09-02 10:41:45.000000000 +0200
+++ mkinitrd-6.0.93/nash/procdev.c 2019-10-25 20:32:15.464159654 +0200
@@ -20,6 +20,8 @@
*/
#define _GNU_SOURCE 1
+#include <sys/sysmacros.h>
+
#include "lib.h"
static struct proc_dev_info proc_dev_info[] = {
diff -dPNur mkinitrd-6.0.93-orig/nash/waitdev.c mkinitrd-6.0.93/nash/waitdev.c
--- mkinitrd-6.0.93-orig/nash/waitdev.c 2019-10-25 20:25:32.637736210 +0200
+++ mkinitrd-6.0.93/nash/waitdev.c 2019-10-25 20:32:07.404030893 +0200
@@ -27,6 +27,7 @@
#include <string.h>
#include <unistd.h>
#include <bdevid.h>
+#include <sys/sysmacros.h>
#include <nash.h>
#include "block.h"
|
