mountlo/mountlo-2.6.29.patch at main · systemd-learning/mountlo · GitHub

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
---
 arch/um/Makefile         |    1 +
 arch/um/drivers/Makefile |    2 ++
 arch/um/kernel/Makefile  |    4 ++++
 arch/um/os-Linux/main.c  |    2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

Index: linux-2.6.29/arch/um/Makefile
===================================================================
--- linux-2.6.29.orig/arch/um/Makefile	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29/arch/um/Makefile	2009-04-22 15:23:07.000000000 +0200
@@ -113,6 +113,7 @@ define cmd_vmlinux__
 	-Wl,-T,$(vmlinux-lds) $(vmlinux-init) \
 	-Wl,--start-group $(vmlinux-main) -Wl,--end-group \
 	-lutil \
+	$(FUSE_LIBS) \
 	$(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o \
 	FORCE ,$^) ; rm -f linux
 endef
Index: linux-2.6.29/arch/um/drivers/Makefile
===================================================================
--- linux-2.6.29.orig/arch/um/drivers/Makefile	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29/arch/um/drivers/Makefile	2009-04-22 15:23:07.000000000 +0200
@@ -16,6 +16,7 @@ hostaudio-objs := hostaudio_kern.o
 ubd-objs := ubd_kern.o ubd_user.o
 port-objs := port_kern.o port_user.o
 harddog-objs := harddog_kern.o harddog_user.o
+fuseserv-objs := fuseserv_kern.o fuseserv_user.o

 LDFLAGS_pcap.o := -r $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libpcap.a)

@@ -59,6 +60,7 @@ obj-$(CONFIG_XTERM_CHAN) += xterm.o xter
 obj-$(CONFIG_UML_WATCHDOG) += harddog.o
 obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
 obj-$(CONFIG_UML_RANDOM) += random.o
+obj-y += fuseserv.o

 # pcap_user.o must be added explicitly.
 USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o
Index: linux-2.6.29/arch/um/kernel/Makefile
===================================================================
--- linux-2.6.29.orig/arch/um/kernel/Makefile	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29/arch/um/kernel/Makefile	2009-04-22 15:23:07.000000000 +0200
@@ -17,6 +17,10 @@ obj-$(CONFIG_GCOV)	+= gmon_syms.o

 USER_OBJS := config.o

+obj-y += mountlo.o
+USER_OBJS += mountlo.o
+CFLAGS_mountlo.o = $(FUSE_CFLAGS)
+
 include arch/um/scripts/Makefile.rules

 targets := config.c config.tmp
Index: linux-2.6.29/arch/um/os-Linux/main.c
===================================================================
--- linux-2.6.29.orig/arch/um/os-Linux/main.c	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29/arch/um/os-Linux/main.c	2009-04-22 15:23:07.000000000 +0200
@@ -113,7 +113,7 @@ static void setup_env_path(void)

 extern void scan_elf_aux( char **envp);

-int __init main(int argc, char **argv, char **envp)
+int __init uml_main(int argc, char **argv, char **envp)
 {
 	char **new_argv;
 	int ret, i, err;