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 | |
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')
6 files changed, 0 insertions, 230 deletions
diff --git a/meta/recipes-devtools/insserv/files/161_bts777914_fix_undeclared_identifier.patch b/meta/recipes-devtools/insserv/files/161_bts777914_fix_undeclared_identifier.patch deleted file mode 100644 index 6ee9532a6b..0000000000 --- a/meta/recipes-devtools/insserv/files/161_bts777914_fix_undeclared_identifier.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | insserv (1.14.0-5.1) UNRELEASED; urgency=low | ||
4 | |||
5 | * Non-maintainer upload. | ||
6 | * moving definition of "extension" in listing.h outside of | ||
7 | an if loop with condition related to __STDC_VERSION__. | ||
8 | * I observed that this gets build with gcc-4.9.2, as for gcc | ||
9 | __STDC_VERSION__ is not defined. | ||
10 | * I got these error while using clang to build this package. | ||
11 | * I tested it with clang-3.5(__STDC_VERSION__ 199901L) and | ||
12 | clang 3.7(__STDC_VERSION__ 201112L) and getting same error | ||
13 | described in in Bug #777914. | ||
14 | |||
15 | -- Mohit Bhakkad <mohit.bhakkad@gmail.com> Sat, 04 Apr 2015 19:14:48 +0000 | ||
16 | |||
17 | insserv (1.14.0-5) unstable; urgency=low | ||
18 | |||
19 | * Add +mountall-bootclean to $local_fs virtual facility definition in | ||
20 | Index: insserv-1.14.0/listing.h | ||
21 | =================================================================== | ||
22 | --- insserv-1.14.0.orig/listing.h | ||
23 | +++ insserv-1.14.0/listing.h | ||
24 | @@ -47,9 +47,9 @@ typedef unsigned int uint; | ||
25 | # ifndef asm | ||
26 | # define asm __asm__ | ||
27 | # endif | ||
28 | -# ifndef extension | ||
29 | -# define extension __extension__ | ||
30 | -# endif | ||
31 | +#endif | ||
32 | +#ifndef extension | ||
33 | +# define extension __extension__ | ||
34 | #endif | ||
35 | #ifndef attribute | ||
36 | # define attribute(attr) __attribute__(attr) | ||
diff --git a/meta/recipes-devtools/insserv/files/disable_runtests.patch b/meta/recipes-devtools/insserv/files/disable_runtests.patch deleted file mode 100644 index 15a7dd80c0..0000000000 --- a/meta/recipes-devtools/insserv/files/disable_runtests.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
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 deleted file mode 100644 index 4858f85b69..0000000000 --- a/meta/recipes-devtools/insserv/files/insserv.conf +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
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 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 | |||
diff --git a/meta/recipes-devtools/insserv/files/run-ptest b/meta/recipes-devtools/insserv/files/run-ptest deleted file mode 100644 index 4a6da3030a..0000000000 --- a/meta/recipes-devtools/insserv/files/run-ptest +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | basedir=$(dirname $0) | ||
4 | . $basedir/common | ||
5 | |||
6 | output() { | ||
7 | if [ $? -eq 0 ]; \ | ||
8 | then echo "PASS: $i"; \ | ||
9 | else echo "FAIL: $i"; \ | ||
10 | fi; | ||
11 | } | ||
12 | |||
13 | for i in test_simple_sequence test_undetected_loop; \ | ||
14 | do $i >/dev/null 2>&1; output; \ | ||
15 | done | ||
16 | |||
17 | rm -rf ${tmpdir} | ||
diff --git a/meta/recipes-devtools/insserv/insserv_1.14.0.bb b/meta/recipes-devtools/insserv/insserv_1.14.0.bb deleted file mode 100644 index b66e98b49f..0000000000 --- a/meta/recipes-devtools/insserv/insserv_1.14.0.bb +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | SUMMARY = "Boot sequence organizer using LSB init.d dependencies" | ||
2 | DESCRIPTION = "This utility reorders the init.d boot scripts based on dependencies given in scripts' LSB comment \ | ||
3 | headers, or in override files included in this package or added in /etc/insserv." | ||
4 | # There is no known home page for insserv | ||
5 | SECTION = "base" | ||
6 | LICENSE = "GPLv2" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
8 | |||
9 | PR = "r1" | ||
10 | |||
11 | SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${BPN}-${PV}.tar.bz2 \ | ||
12 | file://makefile.patch \ | ||
13 | file://disable_runtests.patch \ | ||
14 | file://161_bts777914_fix_undeclared_identifier.patch \ | ||
15 | file://insserv.conf \ | ||
16 | file://run-ptest \ | ||
17 | " | ||
18 | |||
19 | SRC_URI[md5sum] = "4a97d900855148842b1aa8f33b988b47" | ||
20 | SRC_URI[sha256sum] = "89a0a093b1cf3d802ad40568e64b496b493f51ff9825905c8bd12738b374ca47" | ||
21 | |||
22 | do_install () { | ||
23 | oe_runmake 'DESTDIR=${D}' install | ||
24 | install -m0644 ${WORKDIR}/insserv.conf ${D}${sysconfdir}/insserv.conf | ||
25 | } | ||
26 | |||
27 | do_install_class-native () { | ||
28 | oe_runmake 'DESTDIR=${D}/${STAGING_DIR_NATIVE}' install | ||
29 | install -m0644 ${WORKDIR}/insserv.conf ${D}${sysconfdir}/insserv.conf | ||
30 | } | ||
31 | |||
32 | BBCLASSEXTEND = "native" | ||
33 | |||
34 | inherit ptest | ||
35 | |||
36 | do_install_ptest() { | ||
37 | for i in common suite; do cp ${S}/tests/$i ${D}${PTEST_PATH}; done | ||
38 | sed -e 's|${\PWD}/insserv|insserv|;/trap/d' -i ${D}${PTEST_PATH}/suite | ||
39 | sed -e '/test_simple_sequence$/d;/test_undetected_loop$/d' -i ${D}${PTEST_PATH}/common | ||
40 | } | ||
41 | |||
42 | RDEPENDS_${PN}-ptest += "bash" | ||