From c527fd1f14c27855a37f2e8ac5346ce8d940ced2 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 16 Oct 2014 03:05:19 +0200 Subject: initial commit for Enea Linux 4.0-140929 Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea --- .../insserv/files/disable_runtests.patch | 21 +++++++ meta/recipes-devtools/insserv/files/insserv.conf | 41 ++++++++++++ meta/recipes-devtools/insserv/files/makefile.patch | 73 ++++++++++++++++++++++ meta/recipes-devtools/insserv/files/run-ptest | 17 +++++ meta/recipes-devtools/insserv/insserv_1.14.0.bb | 41 ++++++++++++ 5 files changed, 193 insertions(+) create mode 100644 meta/recipes-devtools/insserv/files/disable_runtests.patch create mode 100644 meta/recipes-devtools/insserv/files/insserv.conf create mode 100644 meta/recipes-devtools/insserv/files/makefile.patch create mode 100644 meta/recipes-devtools/insserv/files/run-ptest create mode 100644 meta/recipes-devtools/insserv/insserv_1.14.0.bb (limited to 'meta/recipes-devtools/insserv') 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 @@ +Disable the make check runtime tests, which cannot be run when +cross-compiled. + +Upstream-Status: Pending + +Signed-off-by: Scott Garman + +diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0/Makefile +--- insserv-1.14.0.orig//Makefile 2010-11-28 17:12:01.715597293 -0800 ++++ insserv-1.14.0/Makefile 2010-11-28 17:16:33.837780660 -0800 +@@ -119,8 +119,8 @@ + ifeq ($(ISSUSE),-DSUSE) + issuse=true tests/common + # issuse=true tests/suse +-else +- tests/common ++#else ++# tests/common + endif + + 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 @@ +# +# All local filesystems are mounted (done during boot phase) +# +$local_fs mountall + +# +# Low level networking (ethernet card) +# +$network networking +pcmcia +hotplug + +# +# Named is operational +# +$named +named +dnsmasq +lwresd $network + +# +# All remote filesystems are mounted (note in some cases /usr may +# be remote. Most applications that care will probably require +# both $local_fs and $remote_fs) +# +$remote_fs $local_fs +mountnfs + +# +# System logger is operational +# +$syslog sysklogd + +# +# SunRPC portmapper available +# +$portmap portmap + +# +# The system time has been set correctly +# +$time hwclock + +# +# Services which need to be 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 @@ +Enable debug options and modify the use of CLFAGS (carried over +from the previous version's patch). + +Upstream-Status: Pending + +Signed-off-by: Scott Garman + +diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0//Makefile +--- insserv-1.14.0.orig//Makefile 2010-04-29 03:33:40.000000000 -0700 ++++ insserv-1.14.0//Makefile 2010-11-28 17:09:20.537996190 -0800 +@@ -8,27 +8,16 @@ + INITDIR = /etc/init.d + INSCONF = /etc/insserv.conf + #DESTDIR = /tmp/root +-#DEBUG = -DDEBUG=1 -Wpacked ++DEBUG = -DDEBUG=1 -Wpacked + DEBUG = +-ISSUSE = -DSUSE ++#ISSUSE = -DSUSE + DESTDIR = + VERSION = 1.14.0 + DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]') + +-# +-# Architecture +-# +-ifdef RPM_OPT_FLAGS +- COPTS = -g $(RPM_OPT_FLAGS) +-else +- ARCH = $(shell uname -i) +-ifeq ($(ARCH),i386) +- COPTS = -g -O3 -mcpu=i586 -mtune=i686 +-else +- COPTS = -g -O2 +-endif +-endif +- CFLAGS = -W -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ ++COPTS = -O2 -g ++ ++ MY_CFLAGS = $(CFLAGS) -W -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ + $(ISSUSE) -DINITDIR=\"$(INITDIR)\" -DINSCONF=\"$(INSCONF)\" -pipe + CLOOP = -falign-loops=0 + LDFLAGS = -Wl,-O,3,--relax +@@ -75,13 +64,13 @@ + all: $(TODO) + + insserv: insserv.o listing.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) ++ $(CC) $(MY_CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + + listing.o: listing.c listing.h config.h .system +- $(CC) $(CFLAGS) $(CLOOP) -c $< ++ $(CC) $(MY_CFLAGS) $(CLOOP) -c $< + + insserv.o: insserv.c listing.h config.h .system +- $(CC) $(CFLAGS) $(CLOOP) -c $< ++ $(CC) $(MY_CFLAGS) $(CLOOP) -c $< + + listing.h: .system + +@@ -119,10 +108,10 @@ + -include .depend.listing .depend.insserv + + .depend.listing:: listing.c listing.h +- @$(CC) $(CFLAGS) -M listing.c >$@ 2>/dev/null ++ @$(CC) $(MY_CFLAGS) -M listing.c >$@ 2>/dev/null + + .depend.insserv:: insserv.c listing.h +- @$(CC) $(CFLAGS) -M insserv.c >$@ 2>/dev/null ++ @$(CC) $(MY_CFLAGS) -M insserv.c >$@ 2>/dev/null + + endif + diff --git a/meta/recipes-devtools/insserv/files/run-ptest b/meta/recipes-devtools/insserv/files/run-ptest new file mode 100644 index 0000000000..495d1551c2 --- /dev/null +++ b/meta/recipes-devtools/insserv/files/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +basedir=$(dirname $0) +. $basedir/common + +output() { + if [ $? -eq 0 ]; \ + then echo "PASS: $i"; \ + else echo "FAIL: $i"; \ + fi; +} + +for i in test_simple_sequence test_undetected_loop; \ + do $i &>/dev/null ; output; \ +done + +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 new file mode 100644 index 0000000000..4a33e16912 --- /dev/null +++ b/meta/recipes-devtools/insserv/insserv_1.14.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "Boot sequence organizer using LSB init.d dependencies" +DESCRIPTION = "This utility reorders the init.d boot scripts based on dependencies given in scripts' LSB comment \ +headers, or in override files included in this package or added in /etc/insserv." +# There is no known home page for insserv +SECTION = "base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +PR = "r1" + +SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${BPN}-${PV}.tar.bz2 \ + file://makefile.patch \ + file://disable_runtests.patch \ + file://insserv.conf \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "4a97d900855148842b1aa8f33b988b47" +SRC_URI[sha256sum] = "89a0a093b1cf3d802ad40568e64b496b493f51ff9825905c8bd12738b374ca47" + +do_install () { + oe_runmake 'DESTDIR=${D}' install + install -m0644 ${WORKDIR}/insserv.conf ${D}${sysconfdir}/insserv.conf +} + +do_install_class-native () { + oe_runmake 'DESTDIR=${D}/${STAGING_DIR_NATIVE}' install + install -m0644 ${WORKDIR}/insserv.conf ${D}${sysconfdir}/insserv.conf +} + +BBCLASSEXTEND = "native" + +inherit ptest + +do_install_ptest() { + for i in common suite; do cp ${S}/tests/$i ${D}${PTEST_PATH}; done + sed -e 's|${\PWD}/insserv|insserv|;/trap/d' -i ${D}${PTEST_PATH}/suite + sed -e '/test_simple_sequence$/d;/test_undetected_loop$/d' -i ${D}${PTEST_PATH}/common +} + +RDEPENDS_${PN}-ptest += "bash" -- cgit v1.2.3-54-g00ecf