diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-10 12:30:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-12 13:10:17 +0100 |
commit | e6bb5dbb62257a7de730ea9085dfd89520f3e47d (patch) | |
tree | da6833d15fcb1ef8df870babe206f1c981fee09c /meta/recipes-devtools/insserv/files/makefile.patch | |
parent | 464ee2e6b7cc5ebfc89869959dbe88c9f25f3476 (diff) | |
download | poky-e6bb5dbb62257a7de730ea9085dfd89520f3e47d.tar.gz |
insserv: Remove
Remove insserv from OE-Core. It did have uses but we've optimised the sysvinit
scripts as needed and there are other directions init systems are moving now.
It no longer belongs in the core.
(From OE-Core rev: 9650efb5bb8fc77627dd567e43f8768b34a22abb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/insserv/files/makefile.patch')
-rw-r--r-- | meta/recipes-devtools/insserv/files/makefile.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/meta/recipes-devtools/insserv/files/makefile.patch b/meta/recipes-devtools/insserv/files/makefile.patch deleted file mode 100644 index 5a248b680e..0000000000 --- a/meta/recipes-devtools/insserv/files/makefile.patch +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
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 | |||