diff options
Diffstat (limited to 'package/systemd/systemd.mk')
| -rw-r--r-- | package/systemd/systemd.mk | 67 |
1 files changed, 36 insertions, 31 deletions
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 30e28adf95..51d0a7b558 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -23,28 +23,31 @@ SYSTEMD_SELINUX_MODULES = systemd udev SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ - -Drootlibdir='/usr/lib' \ - -Dsysvinit-path= \ - -Dsysvrcnd-path= \ - -Dutmp=false \ - -Dman=false \ + -Ddefault-hierarchy=hybrid \ + -Didn=true \ -Dima=false \ + -Dkexec-path=/usr/sbin/kexec \ + -Dkmod-path=/usr/bin/kmod \ -Dldconfig=false \ - -Ddefault-hierarchy=hybrid \ - -Dtests=false \ + -Dloadkeys-path=/usr/bin/loadkeys \ + -Dman=false \ + -Dmount-path=/usr/bin/mount \ + -Dnss-systemd=true \ + -Dquotacheck-path=/usr/sbin/quotacheck \ + -Dquotaon-path=/usr/sbin/quotaon \ + -Drootlibdir='/usr/lib' \ + -Dsetfont-path=/usr/bin/setfont \ -Dsplit-bin=true \ -Dsplit-usr=false \ - -Dsystem-uid-max=999 \ - -Dsystem-gid-max=999 \ - -Dtelinit-path=$(TARGET_DIR)/sbin/telinit \ - -Dkmod-path=/usr/bin/kmod \ - -Dkexec-path=/usr/sbin/kexec \ -Dsulogin-path=/usr/sbin/sulogin \ - -Dmount-path=/usr/bin/mount \ + -Dsystem-gid-max=999 \ + -Dsystem-uid-max=999 \ + -Dsysvinit-path= \ + -Dsysvrcnd-path= \ + -Dtelinit-path= \ + -Dtests=false \ -Dumount-path=/usr/bin/umount \ - -Didn=true \ - -Dnss-systemd=true \ - -Dportabled=false + -Dutmp=false ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl @@ -240,24 +243,20 @@ else SYSTEMD_CONF_OPTS += -Danalyze=false endif -ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) +ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) +# remote also depends on libcurl, this is already added above. SYSTEMD_DEPENDENCIES += libmicrohttpd -SYSTEMD_CONF_OPTS += -Dmicrohttpd=true -ifeq ($(BR2_PACKAGE_LIBQRENCODE),y) -SYSTEMD_CONF_OPTS += -Dqrencode=true -SYSTEMD_DEPENDENCIES += libqrencode -else -SYSTEMD_CONF_OPTS += -Dqrencode=false -endif +SYSTEMD_CONF_OPTS += -Dremote=true -Dmicrohttpd=true +SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * - - - systemd Journal Remote else -SYSTEMD_CONF_OPTS += -Dmicrohttpd=false -Dqrencode=false +SYSTEMD_CONF_OPTS += -Dremote=false -Dmicrohttpd=false endif -ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) -SYSTEMD_CONF_OPTS += -Dremote=true -SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * - - - systemd Journal Remote +ifeq ($(BR2_PACKAGE_LIBQRENCODE),y) +SYSTEMD_DEPENDENCIES += libqrencode +SYSTEMD_CONF_OPTS += -Dqrencode=true else -SYSTEMD_CONF_OPTS += -Dremote=false +SYSTEMD_CONF_OPTS += -Dqrencode=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) @@ -417,6 +416,12 @@ else SYSTEMD_CONF_OPTS += -Dpolkit=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_PORTABLED),y) +SYSTEMD_CONF_OPTS += -Dportabled=true +else +SYSTEMD_CONF_OPTS += -Dportabled=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management @@ -576,7 +581,7 @@ ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # * enable serial-getty@xxx for other $BR2_TARGET_GENERIC_TTY_PATH # * rewrite baudrates if a baudrate is provided define SYSTEMD_INSTALL_SERVICE_TTY - mkdir $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ printf '[Install]\nDefaultInstance=\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf; \ if [ $(BR2_TARGET_GENERIC_GETTY_PORT) = "console" ]; \ @@ -588,7 +593,7 @@ define SYSTEMD_INSTALL_SERVICE_TTY $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ >$(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf; \ else \ - mkdir $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d;\ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d;\ printf '[Install]\nDefaultInstance=%s\n' \ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ >$(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d/buildroot-console.conf;\ |