diff options
| author | Eric Andersen <andersen@codepoet.org> | 2006-04-10 22:49:48 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2006-04-10 22:49:48 +0000 |
| commit | 674d61d84b2b754057be95038462b97ad83f759f (patch) | |
| tree | 08f19974441080147b1a2406bbe62b5847035162 /package | |
| parent | bfcb34c69f8a1e28bbd2daf3d5841350fa855f10 (diff) | |
yet again... rework fakeroot handling to ensure fakeroot is invoked just once,
as it seems to sometimes lose values logged during from earlier invocations.
Diffstat (limited to 'package')
| -rw-r--r-- | package/at/at.mk | 7 | ||||
| -rw-r--r-- | package/ltp-testsuite/ltp-testsuite.mk | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/package/at/at.mk b/package/at/at.mk index c0afdf92d..66f766731 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -42,10 +42,9 @@ $(AT_DIR)/$(AT_BINARY): $(AT_DIR)/.configured $(TARGET_DIR)/$(AT_TARGET_BINARY): $(AT_DIR)/$(AT_BINARY) # Use fakeroot to pretend to do 'make install' as root - rm -f $(STAGING_DIR)/.fakeroot.at - $(STAGING_DIR)/usr/bin/fakeroot -s $(STAGING_DIR)/.fakeroot.at -- \ - $(MAKE) DAEMON_USERNAME=root DAEMON_GROUPNAME=root \ - $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(AT_DIR) install + echo "$(MAKE) DAEMON_USERNAME=root DAEMON_GROUPNAME=root " \ + "$(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(AT_DIR) install" \ + > $(STAGING_DIR)/.fakeroot.at $(INSTALL) -m 0755 -D $(AT_DIR)/debian/rc $(TARGET_DIR)/etc/init.d/S99at rm -rf $(TARGET_DIR)/usr/man diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 5c05613ef..02f12c428 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -28,11 +28,9 @@ $(LTP_TESTSUITE_DIR)/.compiled: $(LTP_TESTSUITE_DIR)/Makefile $(LTP_TESTSUITE_DIR)/.installed: $(LTP_TESTSUITE_DIR)/.compiled # Use fakeroot to pretend to do 'make install' as root - rm -f $(STAGING_DIR)/.fakeroot.ltp - $(STAGING_DIR)/usr/bin/fakeroot \ - -s $(STAGING_DIR)/.fakeroot.ltp -- \ - $(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \ - -C $(LTP_TESTSUITE_DIR) install + echo "$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) " \ + "-C $(LTP_TESTSUITE_DIR) install" \ + > $(STAGING_DIR)/.fakeroot.ltp touch $(LTP_TESTSUITE_DIR)/.installed ltp-testsuite: uclibc host-fakeroot $(LTP_TESTSUITE_DIR)/.installed |