diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2015-06-18 14:31:23 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2015-06-18 14:31:23 +0200 |
| commit | 878707bd943a04fc8e3a55a151499359e81ce780 (patch) | |
| tree | 1841969cac654ea210ca65f80b3226b2e881b207 /rules | |
| parent | 256957ac85cfedd530f9236d367a403b718f7a67 (diff) | |
| download | ptxdist-878707bd943a04fc8e3a55a151499359e81ce780.tar.gz ptxdist-878707bd943a04fc8e3a55a151499359e81ce780.tar.xz | |
logrotate: version bump to 3.9.1
- compile using autotools instead of hand craftet build system
- add example config file
- add example systemd timer and service
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/logrotate.in | 20 | ||||
| -rw-r--r-- | rules/logrotate.make | 27 |
2 files changed, 37 insertions, 10 deletions
diff --git a/rules/logrotate.in b/rules/logrotate.in index 6272bd28c..9d23e18b6 100644 --- a/rules/logrotate.in +++ b/rules/logrotate.in @@ -1,8 +1,11 @@ ## SECTION=disk_and_file -config LOGROTATE + +menuconfig LOGROTATE tristate - prompt "logrotate" + prompt "logrotate " select LIBPOPT + select ACL if LOGROTATE_ACL + select ACL_SHARED if LOGROTATE_ACL help The logrotate utility is designed to simplify the administration of log files on a system which generates a lot @@ -11,3 +14,16 @@ config LOGROTATE be set to handle a log file daily, weekly, monthly or when the log file gets to a certain size. Normally, logrotate runs as a daily cron job. + +if LOGROTATE + +config LOGROTATE_ACL + bool "acl support" + +config LOGROTATE_SYSTEMD_UNIT + bool + default y + depends on SYSTEMD + prompt "install systemd timer/service files" + +endif diff --git a/rules/logrotate.make b/rules/logrotate.make index 145d29ea4..a4be3be56 100644 --- a/rules/logrotate.make +++ b/rules/logrotate.make @@ -1,6 +1,6 @@ # -*-makefile-*- # -# Copyright (C) 2006 by Marc Kleine-Budde <mkl@pengutronix.de> +# Copyright (C) 2006, 2015 by Marc Kleine-Budde <mkl@pengutronix.de> # (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de> # # See CREDITS for details about who has contributed to this project. @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LOGROTATE) += logrotate # # Paths and names # -LOGROTATE_VERSION := 3.8.7 -LOGROTATE_MD5 := 99e08503ef24c3e2e3ff74cc5f3be213 +LOGROTATE_VERSION := 3.9.1 +LOGROTATE_MD5 := 4492b145b6d542e4a2f41e77fa199ab0 LOGROTATE := logrotate-$(LOGROTATE_VERSION) LOGROTATE_SUFFIX := tar.gz LOGROTATE_URL := https://fedorahosted.org/releases/l/o/logrotate/$(LOGROTATE).$(LOGROTATE_SUFFIX) @@ -30,11 +30,12 @@ LOGROTATE_LICENSE := GPLv2 # Compile # ---------------------------------------------------------------------------- -LOGROTATE_PATH := PATH=$(CROSS_PATH) -LOGROTATE_MAKE_ENV := $(CROSS_ENV) RPM_OPT_FLAGS='$(strip $(CROSS_CPPFLAGS))' -LOGROTATE_MAKE_OPT := OS_NAME=Linux LFS=-D_FILE_OFFSET_BITS=64 - -LOGROTATE_INSTALL_OPT := PREFIX=$(LOGROTATE_PKGDIR) install +LOGROTATE_CONF_TOOL := autoconf +LOGROTATE_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + $(GLOBAL_LARGE_FILE_OPTION) \ + --$(call ptx/wwo, PTXCONF_LOGROTATE_ACL)-acl \ + --$(call ptx/wwo, PTXCONF_GLOBAL_SELINUX)-selinux # ---------------------------------------------------------------------------- # Target-Install @@ -50,6 +51,16 @@ $(STATEDIR)/logrotate.targetinstall: @$(call install_fixup, logrotate,DESCRIPTION,missing) @$(call install_copy, logrotate, 0, 0, 0755, -, /usr/sbin/logrotate) + @$(call install_alternative, logrotate, 0, 0, 0644, /etc/logrotate.conf) + +ifdef PTXCONF_LOGROTATE_SYSTEMD_UNIT + @$(call install_alternative, logrotate, 0, 0, 0644, \ + /lib/systemd/system/logrotate.timer) + @$(call install_alternative, logrotate, 0, 0, 0644, \ + /lib/systemd/system/logrotate.service) + @$(call install_link, logrotate, ../logrotate.timer, \ + /lib/systemd/system/multi-user.target.wants/logrotate.timer) +endif @$(call install_finish, logrotate) |