diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-11-27 22:18:32 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-11-27 22:18:32 +0100 |
| commit | d47894abb5304cf3bb30b3669e596d648b5277ba (patch) | |
| tree | 8c48d28feb38bda228fa387c58e82d1873929406 /mk | |
| parent | 0a0c116036e3a2d44af3169d52637ca80c7f535c (diff) | |
finetune systemd/sysv integration, use /var tmpfs mountpoint
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 4 | ||||
| -rw-r--r-- | mk/image.mk | 2 | ||||
| -rw-r--r-- | mk/package.mk | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index 1c8a33d3f..9ab3c83d6 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -126,6 +126,10 @@ POSTCONFIG= -@\ cleandir=1;\ rebuild=1;\ fi; \ + if [ "$$(grep ^ADK_RUNTIME_INIT_ .config|md5sum)" != "$$(grep ^ADK_RUNTIME_BASE_ .config.old|md5sum)" ];then \ + cleandir=1;\ + rebuild=1;\ + fi; \ if [ "$$(grep ^ADK_RUNTIME_BASE_ .config|md5sum)" != "$$(grep ^ADK_RUNTIME_BASE_ .config.old|md5sum)" ];then \ cleandir=1;\ rebuild=1;\ diff --git a/mk/image.mk b/mk/image.mk index 272c21709..3485b43b6 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -78,8 +78,6 @@ ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),y) ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/halt ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/poweroff ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/reboot - ln -fs ../../../lib/systemd/system/multi-user.target \ - $(TARGET_DIR)/etc/systemd/system/default.target endif test -z $(GIT) || \ $(GIT) log -1|head -1|sed -e 's#commit ##' \ diff --git a/mk/package.mk b/mk/package.mk index 5510cf445..40a791616 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -229,9 +229,10 @@ ifneq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) endif ifeq (${ADK_RUNTIME_INIT_SYSTEMD},y) @for file in $$$$(ls ./files/*.service 2>/dev/null); do \ - mkdir -p $$(IDIR_$(1))/usr/lib/systemd/system && cp $$$$file $$(IDIR_$(1))/usr/lib/systemd/system; \ + fname=$$$$(echo $$$$file| sed -e "s#.*/##"); \ + mkdir -p $$(IDIR_$(1))/usr/lib/systemd/system && cp $$$$file $$(IDIR_$(1))/usr/lib/systemd/system/$$$$fname; \ mkdir -p $$(IDIR_$(1))/etc/systemd/system/multi-user.target.wants; \ - ln -sf ../../../../usr/lib/systemd/system/$$$$file \ + ln -sf ../../../../usr/lib/systemd/system/$$$$fname \ $$(IDIR_$(1))/etc/systemd/system/multi-user.target.wants; \ done endif |