diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-07-21 11:38:32 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-07-21 11:38:32 +0000 |
| commit | b56be2db834164a767740da4b63ee35c42164086 (patch) | |
| tree | 611333460a7d42b461ae975d18b5609fd223b9f4 /packages/sysklogd | |
| parent | 4f512b95406a1e0354cb64ce4e679c6ed1437b17 (diff) | |
| parent | bacf7fec4317a33c54f60e59032b4dc4f9e264d0 (diff) | |
merge of 'a153d288427652523d9cf6ef78faccfc723035d5'
and 'd910c68cbd1dafb9c6b77187abde5e456d8606e9'
Diffstat (limited to 'packages/sysklogd')
| -rw-r--r-- | packages/sysklogd/sysklogd-1.5/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/sysklogd/sysklogd-1.5/nonrootinstall.patch | 21 | ||||
| -rw-r--r-- | packages/sysklogd/sysklogd.inc | 17 | ||||
| -rw-r--r-- | packages/sysklogd/sysklogd_1.4.1.bb | 18 | ||||
| -rw-r--r-- | packages/sysklogd/sysklogd_1.5.bb | 1 |
5 files changed, 40 insertions, 17 deletions
diff --git a/packages/sysklogd/sysklogd-1.5/.mtn2git_empty b/packages/sysklogd/sysklogd-1.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sysklogd/sysklogd-1.5/.mtn2git_empty diff --git a/packages/sysklogd/sysklogd-1.5/nonrootinstall.patch b/packages/sysklogd/sysklogd-1.5/nonrootinstall.patch new file mode 100644 index 0000000000..1f15fa5a46 --- /dev/null +++ b/packages/sysklogd/sysklogd-1.5/nonrootinstall.patch @@ -0,0 +1,21 @@ +upstream: not applicable. It seems upstream has made a conscious choice here. See lines 56-61 in the Makefile. + +Index: tmp/sysklogd-1.5/Makefile +=================================================================== +--- sysklogd-1.5.orig/Makefile 2008-07-19 13:33:35.793734746 +0200 ++++ sysklogd-1.5/Makefile 2008-07-19 13:34:07.351535636 +0200 +@@ -131,10 +131,10 @@ + ${INSTALL} -m 500 -s klogd ${BINDIR}/klogd + + install_man: +- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8 +- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslogd.8 ${MANDIR}/man8/syslogd.8 +- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslog.conf.5 ${MANDIR}/man5/syslog.conf.5 +- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} klogd.8 ${MANDIR}/man8/klogd.8 ++ ${INSTALL} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8 ++ ${INSTALL} -m ${MAN_PERMS} syslogd.8 ${MANDIR}/man8/syslogd.8 ++ ${INSTALL} -m ${MAN_PERMS} syslog.conf.5 ${MANDIR}/man5/syslog.conf.5 ++ ${INSTALL} -m ${MAN_PERMS} klogd.8 ${MANDIR}/man8/klogd.8 + + obj-m += oops.o + diff --git a/packages/sysklogd/sysklogd.inc b/packages/sysklogd/sysklogd.inc new file mode 100644 index 0000000000..da05c0e02e --- /dev/null +++ b/packages/sysklogd/sysklogd.inc @@ -0,0 +1,17 @@ +LICENSE = "GPL" +SECTION = "base" +DESCRIPTION = "The sysklogd package implements \ +two system log daemons." + +SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-${PV}.tar.gz \ + file://nonrootinstall.patch;patch=1" + +CFLAGS_append = " -DSYSV" + +do_install () { + install -d ${D}${mandir}/man8 \ + ${D}${mandir}/man5 \ + ${D}${bindir} + oe_runmake 'BINDIR=${D}${bindir}' \ + 'MANDIR=${D}${mandir}' install +} diff --git a/packages/sysklogd/sysklogd_1.4.1.bb b/packages/sysklogd/sysklogd_1.4.1.bb index da05c0e02e..31843d603f 100644 --- a/packages/sysklogd/sysklogd_1.4.1.bb +++ b/packages/sysklogd/sysklogd_1.4.1.bb @@ -1,17 +1 @@ -LICENSE = "GPL" -SECTION = "base" -DESCRIPTION = "The sysklogd package implements \ -two system log daemons." - -SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-${PV}.tar.gz \ - file://nonrootinstall.patch;patch=1" - -CFLAGS_append = " -DSYSV" - -do_install () { - install -d ${D}${mandir}/man8 \ - ${D}${mandir}/man5 \ - ${D}${bindir} - oe_runmake 'BINDIR=${D}${bindir}' \ - 'MANDIR=${D}${mandir}' install -} +require sysklogd.inc diff --git a/packages/sysklogd/sysklogd_1.5.bb b/packages/sysklogd/sysklogd_1.5.bb new file mode 100644 index 0000000000..31843d603f --- /dev/null +++ b/packages/sysklogd/sysklogd_1.5.bb @@ -0,0 +1 @@ +require sysklogd.inc |