summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2014-11-11 17:57:43 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-25 13:03:26 +0000
commit4d9172d5ccfb69c8d231b8a6fa9e33c61cbeb6ba (patch)
tree04371642831ec8b23edf3d1b078cd02b666f168f /meta
parent1379659da5658c01ce2aa040ae924c7b0f5c6fd1 (diff)
downloadpoky-4d9172d5ccfb69c8d231b8a6fa9e33c61cbeb6ba.tar.gz
cronie: Upgrade to 1.4.12
Fixed license BSD, it should've been BSD-3 & BSD-2 Added license GPLv2+ according to upstream Patch fix-out-of-tree-build removed; already on upstream. (From OE-Core rev: c69373a3dcaaccb5a1cabc2890549fc46030e068) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch31
-rw-r--r--meta/recipes-extended/cronie/cronie_1.4.12.bb (renamed from meta/recipes-extended/cronie/cronie_1.4.11.bb)13
2 files changed, 4 insertions, 40 deletions
diff --git a/meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch b/meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch
deleted file mode 100644
index 7384a0bad4..0000000000
--- a/meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1For an out of tree build, the cronie-common.h file was not being
2found correctly, so point it to the top_srcdir
3
4Upstream-Status: Submitted
5
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8Index: cronie-1.4.11/anacron/Makefile.am
9===================================================================
10--- cronie-1.4.11.orig/anacron/Makefile.am
11+++ cronie-1.4.11/anacron/Makefile.am
12@@ -9,6 +9,7 @@ common_nodist = anacron-paths.h
13 nodist_anacron_SOURCES = $(common_nodist)
14 BUILT_SOURCES = $(common_nodist)
15
16+AM_CFLAGS = -I$(top_srcdir)
17
18 LDADD = $(LIBSELINUX) $(LIBPAM) $(LIBAUDIT)
19
20Index: cronie-1.4.11/src/Makefile.am
21===================================================================
22--- cronie-1.4.11.orig/src/Makefile.am
23+++ cronie-1.4.11/src/Makefile.am
24@@ -15,6 +15,7 @@ nodist_crond_SOURCES = $(common_nodist)
25 nodist_crontab_SOURCES = $(common_nodist)
26 BUILT_SOURCES = $(common_nodist)
27
28+AM_CFLAGS = -I$(top_srcdir)
29
30 LDADD = $(LIBSELINUX) $(LIBPAM) $(LIBAUDIT)
31
diff --git a/meta/recipes-extended/cronie/cronie_1.4.11.bb b/meta/recipes-extended/cronie/cronie_1.4.12.bb
index 02234f6a36..e40475662d 100644
--- a/meta/recipes-extended/cronie/cronie_1.4.11.bb
+++ b/meta/recipes-extended/cronie/cronie_1.4.12.bb
@@ -7,16 +7,14 @@ HOMEPAGE = "https://fedorahosted.org/cronie/"
7BUGTRACKER = "mmaslano@redhat.com" 7BUGTRACKER = "mmaslano@redhat.com"
8 8
9# Internet Systems Consortium License 9# Internet Systems Consortium License
10LICENSE = "ISC & BSD" 10LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & GPLv2+"
11LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=dd2a592170760e1386c769e1043b3722 \
12 file://src/cron.c;endline=20;md5=b425c334265026177128353a142633b4 \ 12 file://src/cron.c;endline=20;md5=b425c334265026177128353a142633b4 \
13 file://src/popen.c;beginline=3;endline=31;md5=edd50742d8def712e9472dba353668a9" 13 file://src/popen.c;beginline=3;endline=31;md5=edd50742d8def712e9472dba353668a9"
14 14
15SECTION = "utils" 15SECTION = "utils"
16 16
17
18SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ 17SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
19 file://fix-out-of-tree-build.patch \
20 file://crond.init \ 18 file://crond.init \
21 file://crontab \ 19 file://crontab \
22 file://crond.service \ 20 file://crond.service \
@@ -25,18 +23,16 @@ SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
25PAM_SRC_URI = "file://crond_pam_config.patch" 23PAM_SRC_URI = "file://crond_pam_config.patch"
26PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" 24PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
27 25
28SRC_URI[md5sum] = "2ba645cf54de17f138ef70312843862f" 26SRC_URI[md5sum] = "199db91e514a4d75e3222d69874b132f"
29SRC_URI[sha256sum] = "fd08084cedddbb42499f80ddb7f2158195c3555c2ff40ee11d4ece2f9864d7be" 27SRC_URI[sha256sum] = "0f5c9bf32f352599451c4ca0d6bc076d19e73ecfa5a90b34ecfe47c918c8bafd"
30 28
31inherit autotools update-rc.d useradd systemd 29inherit autotools update-rc.d useradd systemd
32 30
33
34PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 31PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
35 32
36PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," 33PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit,"
37PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" 34PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}"
38 35
39
40INITSCRIPT_NAME = "crond" 36INITSCRIPT_NAME = "crond"
41INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." 37INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ."
42 38
@@ -82,4 +78,3 @@ do_install_append () {
82} 78}
83 79
84FILES_${PN} += "${sysconfdir}/cron*" 80FILES_${PN} += "${sysconfdir}/cron*"
85