diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-12-28 19:05:53 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-12-28 19:05:53 +0100 |
| commit | 3a162416dae54e19e4645d1df7d60a5402f87787 (patch) | |
| tree | de87ac65479461b0ab0cd79dbf5e53cfdbea49e5 | |
| parent | 9adfefa349bb8b9b3eaeb771a5019791299564ca (diff) | |
systemd: add some flavours, before starting meson conversion
| -rw-r--r-- | package/pam/Makefile | 1 | ||||
| -rw-r--r-- | package/systemd/Makefile | 24 |
2 files changed, 21 insertions, 4 deletions
diff --git a/package/pam/Makefile b/package/pam/Makefile index 63f110131..1030dd69a 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -13,7 +13,6 @@ PKG_SECTION:= sys/misc PKG_URL:= http://www.linux-pam.org/ PKG_SITES:= http://www.linux-pam.org/library/ PKG_OPTS:= dev -PKG_BB:= 1 DISTFILES:= Linux-PAM-$(PKG_VERSION).tar.gz WRKDIST= ${WRKDIR}/Linux-PAM-${PKG_VERSION} diff --git a/package/systemd/Makefile b/package/systemd/Makefile index 78616b450..69dd8c510 100644 --- a/package/systemd/Makefile +++ b/package/systemd/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= systemd PKG_VERSION:= 234 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= da3e69d10aa1c983d33833372ad4929037b411ac421fb085c8cee79ae1d80b6a PKG_DESCR:= system and service manager PKG_SECTION:= base/init @@ -19,6 +19,14 @@ PKG_SITES:= https://github.com/systemd/systemd/archive/ PKG_CFLINE_SYSTEMD:= select BUSYBOX_SULOGIN PKG_LIBC_DEPENDS:= !musl +PKG_FLAVOURS_SYSTEMD:= WITH_PAM WITH_XZ +PKGFD_WITH_PAM:= enable pam support +PKGFS_WITH_PAM:= pam +PKGFB_WITH_PAM:= pam +PKGFD_WITH_XZ:= enable xz support +PKGFS_WITH_XZ:= xz +PKGFB_WITH_XZ:= xz + DISTFILES:= v$(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk @@ -34,7 +42,6 @@ CONFIGURE_ARGS+= --disable-static \ --disable-manpages \ --disable-selinux \ --enable-split-usr \ - --disable-pam \ --disable-ima \ --disable-efi \ --disable-gnuefi \ @@ -55,7 +62,6 @@ CONFIGURE_ARGS+= --disable-static \ --disable-polkit \ --disable-bzip2 \ --disable-lz4 \ - --disable-xz \ --disable-zlib \ --disable-libcurl \ --disable-gcrypt \ @@ -83,6 +89,18 @@ CONFIGURE_ARGS+= --disable-static \ --enable-tmpfiles \ --enable-firstboot +ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_PAM),y) +CONFIGURE_ARGS+= --enable-pam +else +CONFIGURE_ARGS+= --disable-pam +endif + +ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_XZ),y) +CONFIGURE_ARGS+= --enable-xz +else +CONFIGURE_ARGS+= --disable-xz +endif + systemd-install: $(INSTALL_DIR) $(IDIR_SYSTEMD)/etc touch $(IDIR_SYSTEMD)/etc/machine-id |