diff options
| author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-09-27 21:32:44 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-10-04 18:54:16 +0200 |
| commit | aaffd209fae91a733fe0becb72268f87bf4ea369 (patch) | |
| tree | 40569895ef8a09c605060e2164d86567a12f9889 /package/systemd | |
| parent | 1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff) | |
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/systemd')
| -rw-r--r-- | package/systemd/systemd.mk | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index ea6baaa9d..face84913 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -26,7 +26,7 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) SYSTEMD_DEPENDENCIES += busybox endif -SYSTEMD_CONF_OPT += \ +SYSTEMD_CONF_OPTS += \ --with-rootprefix= \ --with-rootlibdir=/lib \ --localstatedir=/var \ @@ -57,42 +57,42 @@ SYSTEMD_CONF_ENV = \ ac_cv_path_KMOD=/usr/bin/kmod ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y) -SYSTEMD_CONF_OPT += --enable-compat-libs +SYSTEMD_CONF_OPTS += --enable-compat-libs else -SYSTEMD_CONF_OPT += --disable-compat-libs +SYSTEMD_CONF_OPTS += --disable-compat-libs endif ifeq ($(BR2_PACKAGE_ACL),y) -SYSTEMD_CONF_OPT += --enable-acl +SYSTEMD_CONF_OPTS += --enable-acl SYSTEMD_DEPENDENCIES += acl else -SYSTEMD_CONF_OPT += --disable-acl +SYSTEMD_CONF_OPTS += --disable-acl endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -SYSTEMD_CONF_OPT += --enable-gudev +SYSTEMD_CONF_OPTS += --enable-gudev SYSTEMD_DEPENDENCIES += libglib2 else -SYSTEMD_CONF_OPT += --disable-gudev +SYSTEMD_CONF_OPTS += --disable-gudev endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -SYSTEMD_CONF_OPT += --enable-seccomp +SYSTEMD_CONF_OPTS += --enable-seccomp SYSTEMD_DEPENDENCIES += libseccomp else -SYSTEMD_CONF_OPT += --disable-seccomp +SYSTEMD_CONF_OPTS += --disable-seccomp endif ifeq ($(BR2_PACKAGE_SYSTEMD_ALL_EXTRAS),y) SYSTEMD_DEPENDENCIES += \ xz \ libgcrypt -SYSTEMD_CONF_OPT += \ +SYSTEMD_CONF_OPTS += \ --enable-xz \ --enable-gcrypt \ --with-libgcrypt-prefix=$(STAGING_DIR)/usr else -SYSTEMD_CONF_OPT += \ +SYSTEMD_CONF_OPTS += \ --disable-xz \ --disable-gcrypt endif @@ -100,17 +100,17 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) SYSTEMD_DEPENDENCIES += libmicrohttpd else -SYSTEMD_CONF_OPT += --disable-microhttpd +SYSTEMD_CONF_OPTS += --disable-microhttpd endif ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) -SYSTEMD_CONF_OPT += --enable-networkd +SYSTEMD_CONF_OPTS += --enable-networkd define SYSTEMD_INSTALL_RESOLVCONF_HOOK ln -sf ../run/systemd/resolve/resolv.conf \ $(TARGET_DIR)/etc/resolv.conf endef else -SYSTEMD_CONF_OPT += --disable-networkd +SYSTEMD_CONF_OPTS += --disable-networkd define SYSTEMD_INSTALL_SERVICE_NETWORK $(INSTALL) -D -m 644 package/systemd/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service @@ -121,20 +121,20 @@ endef endif ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) -SYSTEMD_CONF_OPT += --enable-timesyncd +SYSTEMD_CONF_OPTS += --enable-timesyncd define SYSTEMD_INSTALL_SERVICE_TIMESYNC mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants ln -sf ../../../../lib/systemd/system/systemd-timesyncd.service \ $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service endef else -SYSTEMD_CONF_OPT += --disable-timesyncd +SYSTEMD_CONF_OPTS += --disable-timesyncd endif ifeq ($(BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT),y) -SYSTEMD_CONF_OPT += --enable-smack +SYSTEMD_CONF_OPTS += --enable-smack else -SYSTEMD_CONF_OPT += --disable-smack +SYSTEMD_CONF_OPTS += --disable-smack endif # mq_getattr needs -lrt |