svn commit: [25555] trunk/buildroot/package/logrotate

[Peter Korsgaard-3]

Author: jacmet
Date: 2009-03-05 19:00:17 +0000 (Thu, 05 Mar 2009)
New Revision: 25555

Log:
logrotate: only install logrotate.conf if not present in target_skeleton

Allow platforms to provide a custom logrotate.conf in their target_skeleton.

Modified:
   trunk/buildroot/package/logrotate/logrotate.mk


Changeset:
Modified: trunk/buildroot/package/logrotate/logrotate.mk
===================================================================
--- trunk/buildroot/package/logrotate/logrotate.mk 2009-03-05 19:00:11 UTC (rev 25554)
+++ trunk/buildroot/package/logrotate/logrotate.mk 2009-03-05 19:00:17 UTC (rev 25555)
@@ -18,7 +18,9 @@
 
 $(TARGET_DIR)/$(LOGROTATE_TARGET_BINARY): $(LOGROTATE_DIR)/$(LOGROTATE_BINARY)
  $(MAKE) PREFIX=$(TARGET_DIR) -C $(LOGROTATE_DIR) install
- $(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf
+ if [ ! -f $(TARGET_DIR)/etc/logrotate.conf ]; then
+ $(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf;
+ fi
  $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d
 
 logrotate: popt $(TARGET_DIR)/$(LOGROTATE_TARGET_BINARY)

_______________________________________________
buildroot mailing list
buildroot@...
http://lists.busybox.net/mailman/listinfo/buildroot

[Hiroshi Shinji]

Hi,

> +       if [ ! -f $(TARGET_DIR)/etc/logrotate.conf ]; then
> +               $(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf;

You need to append backslashes to the end of these lines.

Regards,


2009/3/6  <jacmet@...>:

> Author: jacmet
> Date: 2009-03-05 19:00:17 +0000 (Thu, 05 Mar 2009)
> New Revision: 25555
>
> Log:
> logrotate: only install logrotate.conf if not present in target_skeleton
>
> Allow platforms to provide a custom logrotate.conf in their target_skeleton.
>
> Modified:
>   trunk/buildroot/package/logrotate/logrotate.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/logrotate/logrotate.mk
> ===================================================================
> --- trunk/buildroot/package/logrotate/logrotate.mk      2009-03-05 19:00:11 UTC (rev 25554)
> +++ trunk/buildroot/package/logrotate/logrotate.mk      2009-03-05 19:00:17 UTC (rev 25555)
> @@ -18,7 +18,9 @@
>
>  $(TARGET_DIR)/$(LOGROTATE_TARGET_BINARY): $(LOGROTATE_DIR)/$(LOGROTATE_BINARY)
>        $(MAKE) PREFIX=$(TARGET_DIR) -C $(LOGROTATE_DIR) install
> -       $(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf
> +       if [ ! -f $(TARGET_DIR)/etc/logrotate.conf ]; then
> +               $(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf;
> +       fi
>        $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d
>
>  logrotate: popt $(TARGET_DIR)/$(LOGROTATE_TARGET_BINARY)
>
> _______________________________________________
> buildroot mailing list
> buildroot@...
> http://lists.busybox.net/mailman/listinfo/buildroot
>

--
宍道 洋
hiroshi.shinji@...
_______________________________________________
buildroot mailing list
buildroot@...
http://lists.busybox.net/mailman/listinfo/buildroot

[Peter Korsgaard-3]

>>>>> "Hiroshi" == Hiroshi Shinji <hiroshi.shinji@...> writes:

 Hiroshi> Hi,
 >> +       if [ ! -f $(TARGET_DIR)/etc/logrotate.conf ]; then
 >> +               $(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf;

 Hiroshi> You need to append backslashes to the end of these lines.

But ofcourse - Thanks.

That's what I get from trying to do too many things at once.

--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@...
http://lists.busybox.net/mailman/listinfo/buildroot