diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:38:32 +0100 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:50:20 +0100 |
commit | e2e6f6fe07049f33cb6348780fa975162752e421 (patch) | |
tree | b1813295411235d1297a0ed642b1346b24fdfb12 /meta/recipes-devtools/insserv/files | |
download | poky-e2e6f6fe07049f33cb6348780fa975162752e421.tar.gz |
initial commit of Enea Linux 3.1
Migrated from the internal git server on the dora-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-devtools/insserv/files')
-rw-r--r-- | meta/recipes-devtools/insserv/files/disable_runtests.patch | 21 | ||||
-rw-r--r-- | meta/recipes-devtools/insserv/files/insserv.conf | 41 | ||||
-rw-r--r-- | meta/recipes-devtools/insserv/files/makefile.patch | 73 |
3 files changed, 135 insertions, 0 deletions
diff --git a/meta/recipes-devtools/insserv/files/disable_runtests.patch b/meta/recipes-devtools/insserv/files/disable_runtests.patch new file mode 100644 index 0000000000..15a7dd80c0 --- /dev/null +++ b/meta/recipes-devtools/insserv/files/disable_runtests.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Disable the make check runtime tests, which cannot be run when | ||
2 | cross-compiled. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
7 | |||
8 | diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0/Makefile | ||
9 | --- insserv-1.14.0.orig//Makefile 2010-11-28 17:12:01.715597293 -0800 | ||
10 | +++ insserv-1.14.0/Makefile 2010-11-28 17:16:33.837780660 -0800 | ||
11 | @@ -119,8 +119,8 @@ | ||
12 | ifeq ($(ISSUSE),-DSUSE) | ||
13 | issuse=true tests/common | ||
14 | # issuse=true tests/suse | ||
15 | -else | ||
16 | - tests/common | ||
17 | +#else | ||
18 | +# tests/common | ||
19 | endif | ||
20 | |||
21 | install: $(TODO) check | ||
diff --git a/meta/recipes-devtools/insserv/files/insserv.conf b/meta/recipes-devtools/insserv/files/insserv.conf new file mode 100644 index 0000000000..4858f85b69 --- /dev/null +++ b/meta/recipes-devtools/insserv/files/insserv.conf | |||
@@ -0,0 +1,41 @@ | |||
1 | # | ||
2 | # All local filesystems are mounted (done during boot phase) | ||
3 | # | ||
4 | $local_fs mountall | ||
5 | |||
6 | # | ||
7 | # Low level networking (ethernet card) | ||
8 | # | ||
9 | $network networking +pcmcia +hotplug | ||
10 | |||
11 | # | ||
12 | # Named is operational | ||
13 | # | ||
14 | $named +named +dnsmasq +lwresd $network | ||
15 | |||
16 | # | ||
17 | # All remote filesystems are mounted (note in some cases /usr may | ||
18 | # be remote. Most applications that care will probably require | ||
19 | # both $local_fs and $remote_fs) | ||
20 | # | ||
21 | $remote_fs $local_fs +mountnfs | ||
22 | |||
23 | # | ||
24 | # System logger is operational | ||
25 | # | ||
26 | $syslog sysklogd | ||
27 | |||
28 | # | ||
29 | # SunRPC portmapper available | ||
30 | # | ||
31 | $portmap portmap | ||
32 | |||
33 | # | ||
34 | # The system time has been set correctly | ||
35 | # | ||
36 | $time hwclock | ||
37 | |||
38 | # | ||
39 | # Services which need to be interactive | ||
40 | # | ||
41 | <interactive> hostname udev | ||
diff --git a/meta/recipes-devtools/insserv/files/makefile.patch b/meta/recipes-devtools/insserv/files/makefile.patch new file mode 100644 index 0000000000..5a248b680e --- /dev/null +++ b/meta/recipes-devtools/insserv/files/makefile.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | Enable debug options and modify the use of CLFAGS (carried over | ||
2 | from the previous version's patch). | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
7 | |||
8 | diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0//Makefile | ||
9 | --- insserv-1.14.0.orig//Makefile 2010-04-29 03:33:40.000000000 -0700 | ||
10 | +++ insserv-1.14.0//Makefile 2010-11-28 17:09:20.537996190 -0800 | ||
11 | @@ -8,27 +8,16 @@ | ||
12 | INITDIR = /etc/init.d | ||
13 | INSCONF = /etc/insserv.conf | ||
14 | #DESTDIR = /tmp/root | ||
15 | -#DEBUG = -DDEBUG=1 -Wpacked | ||
16 | +DEBUG = -DDEBUG=1 -Wpacked | ||
17 | DEBUG = | ||
18 | -ISSUSE = -DSUSE | ||
19 | +#ISSUSE = -DSUSE | ||
20 | DESTDIR = | ||
21 | VERSION = 1.14.0 | ||
22 | DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]') | ||
23 | |||
24 | -# | ||
25 | -# Architecture | ||
26 | -# | ||
27 | -ifdef RPM_OPT_FLAGS | ||
28 | - COPTS = -g $(RPM_OPT_FLAGS) | ||
29 | -else | ||
30 | - ARCH = $(shell uname -i) | ||
31 | -ifeq ($(ARCH),i386) | ||
32 | - COPTS = -g -O3 -mcpu=i586 -mtune=i686 | ||
33 | -else | ||
34 | - COPTS = -g -O2 | ||
35 | -endif | ||
36 | -endif | ||
37 | - CFLAGS = -W -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ | ||
38 | +COPTS = -O2 -g | ||
39 | + | ||
40 | + MY_CFLAGS = $(CFLAGS) -W -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ | ||
41 | $(ISSUSE) -DINITDIR=\"$(INITDIR)\" -DINSCONF=\"$(INSCONF)\" -pipe | ||
42 | CLOOP = -falign-loops=0 | ||
43 | LDFLAGS = -Wl,-O,3,--relax | ||
44 | @@ -75,13 +64,13 @@ | ||
45 | all: $(TODO) | ||
46 | |||
47 | insserv: insserv.o listing.o | ||
48 | - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) | ||
49 | + $(CC) $(MY_CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) | ||
50 | |||
51 | listing.o: listing.c listing.h config.h .system | ||
52 | - $(CC) $(CFLAGS) $(CLOOP) -c $< | ||
53 | + $(CC) $(MY_CFLAGS) $(CLOOP) -c $< | ||
54 | |||
55 | insserv.o: insserv.c listing.h config.h .system | ||
56 | - $(CC) $(CFLAGS) $(CLOOP) -c $< | ||
57 | + $(CC) $(MY_CFLAGS) $(CLOOP) -c $< | ||
58 | |||
59 | listing.h: .system | ||
60 | |||
61 | @@ -119,10 +108,10 @@ | ||
62 | -include .depend.listing .depend.insserv | ||
63 | |||
64 | .depend.listing:: listing.c listing.h | ||
65 | - @$(CC) $(CFLAGS) -M listing.c >$@ 2>/dev/null | ||
66 | + @$(CC) $(MY_CFLAGS) -M listing.c >$@ 2>/dev/null | ||
67 | |||
68 | .depend.insserv:: insserv.c listing.h | ||
69 | - @$(CC) $(CFLAGS) -M insserv.c >$@ 2>/dev/null | ||
70 | + @$(CC) $(MY_CFLAGS) -M insserv.c >$@ 2>/dev/null | ||
71 | |||
72 | endif | ||
73 | |||