deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

- start to use BR2_HAVE_MANPAGES and BR2_HAVE_INFOPAGES

Browse source 
- always error out if ldconfig for the target fails (was inconsistent..)
This commit is contained in:
Bernhard Reutner-Fischer 2007-08-21 14:32:38 +00:00
parent 3cca2a310d
commit 1afb8226cb
8 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/cloop/cloop.mk
View file

@ -75,9 +75,13 @@ check-tools:
clooproot: cloop check-tools $(IMAGE).cramfs ### cramfsroot
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
ifneq ($(BR2_HAVE_MANPAGES),y)
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/share/man
endif
ifneq ($(BR2_HAVE_INFOPAGES),y)
@rm -rf $(TARGET_DIR)/usr/info
endif
@rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
### $(CLOOP_DIR)/create_compressed_fs -q -D target/default/device_table.txt $(TARGET_DIR) $(CLOOP_TARGET)
## mkisofs -r $(TARGET_DIR) | $(CLOOP_DIR)/create_compressed_fs - 65536 > $(CLOOP_TARGET)

6
target/cpio/cpioroot.mk
View file

@ -38,9 +38,13 @@ cpioroot-init:
$(CPIO_BASE): host-fakeroot makedevs cpioroot-init
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
ifneq ($(BR2_HAVE_MANPAGES),y)
@rm -rf $(TARGET_DIR)/usr/man
endif
ifneq ($(BR2_HAVE_INFOPAGES),y)
@rm -rf $(TARGET_DIR)/usr/info
-$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
endif
$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

6
target/cramfs/cramfs.mk
View file

@ -50,9 +50,13 @@ CRAMFS_TARGET=$(IMAGE).cramfs
cramfsroot: host-fakeroot makedevs cramfs
#-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true;
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
ifneq ($(BR2_HAVE_MANPAGES),y)
@rm -rf $(TARGET_DIR)/usr/man
endif
ifneq ($(BR2_HAVE_INFOPAGES),y)
@rm -rf $(TARGET_DIR)/usr/info
-$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
endif
$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

6
target/ext2/ext2root.mk
View file

@ -88,13 +88,17 @@ endif
$(EXT2_BASE): host-fakeroot makedevs genext2fs
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
ifneq ($(BR2_HAVE_MANPAGES),y)
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/share/man
endif
ifneq ($(BR2_HAVE_INFOPAGES),y)
@rm -rf $(TARGET_DIR)/usr/info
endif
@test -d $(TARGET_DIR)/usr/share && \
rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share || \
true
-$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

6
target/initramfs/initramfs.mk
View file

@ -16,9 +16,13 @@ $(INITRAMFS_TARGET) initramfs: host-fakeroot makedevs
rm -f $(TARGET_DIR)/init
ln -s sbin/init $(TARGET_DIR)/init
-find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/man
endif
ifneq ($(BR2_HAVE_INFOPAGES),y)
rm -rf $(TARGET_DIR)/usr/info
-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
endif
$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

6
target/jffs2/jffs2root.mk
View file

@ -50,11 +50,15 @@ endif
#
$(JFFS2_TARGET): host-fakeroot makedevs mtd-host
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
ifneq ($(BR2_HAVE_MANPAGES),y)
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/share/man
endif
ifneq ($(BR2_HAVE_INFOPAGES),y)
@rm -rf $(TARGET_DIR)/usr/info
endif
@rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
-$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

4
target/squashfs/squashfsroot.mk
View file

@ -45,8 +45,12 @@ SQUASHFS_TARGET:=$(IMAGE).squashfs
squashfsroot: host-fakeroot makedevs squashfs
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
ifneq ($(BR2_HAVE_MANPAGES),y)
@rm -rf $(TARGET_DIR)/usr/man
endif
ifneq ($(BR2_HAVE_INFOPAGES),y)
@rm -rf $(TARGET_DIR)/usr/info
endif
$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))

4
target/tar/tarroot.mk
View file

@ -24,8 +24,12 @@ endif
tarroot: host-fakeroot makedevs
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
ifneq ($(BR2_HAVE_MANPAGES),y)
@rm -rf $(TARGET_DIR)/usr/man
endif
ifneq ($(BR2_HAVE_INFOPAGES),y)
@rm -rf $(TARGET_DIR)/usr/info
endif
$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))