[Astlinux-commits] SF.net SVN: astlinux:[7983] branches/1.0/package

[<abe...@us...>]

Revision: 7983
          http://sourceforge.net/p/astlinux/code/7983
Author:   abelbeck
Date:     2016-11-25 19:01:06 +0000 (Fri, 25 Nov 2016)
Log Message:
-----------
Build system tweaks for BR2_PACKAGE_LIBCAP enabled, avahi needs 'ac_cv_func_chroot=no' else with libcap enabled it starts a chroot helper, which works but the default 'rlimit-nproc=3' is exceeded since we share the 'nobody' user with other processes, resulting in 'avahi-daemon' not starting without a --no-rlimits option or commented out 'rlimit-nproc=3'

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk
    branches/1.0/package/avahi/avahi.mk
    branches/1.0/package/ntp/ntp.mk

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2016-11-25 15:03:04 UTC (rev 7982)
+++ branches/1.0/package/asterisk/asterisk.mk	2016-11-25 19:01:06 UTC (rev 7983)
@@ -49,6 +49,12 @@
 ASTERISK_CONFIGURE_ARGS+= \
 			--without-sdl
 
+ifeq ($(strip $(BR2_PACKAGE_LIBCAP)),y)
+ASTERISK_EXTRAS+=libcap
+ASTERISK_CONFIGURE_ARGS+= \
+			--with-cap="$(STAGING_DIR)/usr" 
+endif
+
 ifeq ($(strip $(BR2_PACKAGE_LIBXML2)),y)
 ASTERISK_EXTRAS+=libxml2
 ASTERISK_CONFIGURE_ARGS+= \

Modified: branches/1.0/package/avahi/avahi.mk
===================================================================
--- branches/1.0/package/avahi/avahi.mk	2016-11-25 15:03:04 UTC (rev 7982)
+++ branches/1.0/package/avahi/avahi.mk	2016-11-25 19:01:06 UTC (rev 7983)
@@ -10,6 +10,7 @@
 AVAHI_INSTALL_STAGING = YES
 
 AVAHI_CONF_ENV = \
+	ac_cv_func_chroot=no \
 	ac_cv_func_strtod=yes \
 	ac_fsusage_space=yes \
 	fu_cv_sys_stat_statfs2_bsize=yes \

Modified: branches/1.0/package/ntp/ntp.mk
===================================================================
--- branches/1.0/package/ntp/ntp.mk	2016-11-25 15:03:04 UTC (rev 7982)
+++ branches/1.0/package/ntp/ntp.mk	2016-11-25 19:01:06 UTC (rev 7983)
@@ -29,6 +29,11 @@
 NTP_CONF_OPT += --without-crypto
 endif
 
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+NTP_CONF_OPT += --enable-linuxcaps
+NTP_DEPENDENCIES += libcap
+endif
+
 NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTP_KEYGEN) += util/ntp-keygen
 NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTP_WAIT) += scripts/ntp-wait/ntp-wait
 NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPDATE) += ntpdate/ntpdate

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.