mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 21:56:31 +00:00
toolchain: fix up GNU_TARGET_NAME link and target_utils location
The GNU_TARGET_NAME symlink and target_utils location were not correctly adjusted to match the move of the toolchain to $(STAGING_DIR)/usr, creating dangling symlinks.
This commit is contained in:
parent
81ddf3d083
commit
92bd25c9eb
@ -22,8 +22,8 @@ $(STRACE_HOOK_POST_INSTALL): $(STRACE_TARGET_INSTALL_TARGET)
|
|||||||
$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/strace
|
$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/strace
|
||||||
rm -f $(TARGET_DIR)/usr/bin/strace-graph
|
rm -f $(TARGET_DIR)/usr/bin/strace-graph
|
||||||
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
|
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
|
||||||
mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
|
mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
|
||||||
install -c $(TARGET_DIR)/usr/bin/strace \
|
install -c $(TARGET_DIR)/usr/bin/strace \
|
||||||
$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/strace
|
$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/strace
|
||||||
endif
|
endif
|
||||||
touch $@
|
touch $@
|
||||||
|
@ -57,9 +57,9 @@ $(TARGET_DIR)/usr/bin/stunnel: $(STUNNEL_DIR)/src/stunnel
|
|||||||
install -c $(STUNNEL_DIR)/src/stunnel $(TARGET_DIR)/usr/bin/stunnel
|
install -c $(STUNNEL_DIR)/src/stunnel $(TARGET_DIR)/usr/bin/stunnel
|
||||||
$(STRIPCMD) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1
|
$(STRIPCMD) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1
|
||||||
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
|
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
|
||||||
mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
|
mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
|
||||||
install -c $(TARGET_DIR)/usr/bin/stunnel \
|
install -c $(TARGET_DIR)/usr/bin/stunnel \
|
||||||
$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel
|
$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel
|
||||||
endif
|
endif
|
||||||
|
|
||||||
stunnel: uclibc $(TARGET_DIR)/usr/bin/stunnel
|
stunnel: uclibc $(TARGET_DIR)/usr/bin/stunnel
|
||||||
|
@ -319,14 +319,14 @@ endif
|
|||||||
ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
|
ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
|
||||||
$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
|
$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
|
||||||
fi
|
fi
|
||||||
if [ ! -e $(STAGING_DIR)/usr/bin/cc ]; then \
|
if [ ! -e $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/cc ]; then \
|
||||||
ln -snf gcc $(STAGING_DIR)/usr/bin/cc; \
|
ln -snf gcc $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/cc; \
|
||||||
fi
|
fi
|
||||||
# Set up the symlinks to enable lying about target name.
|
# Set up the symlinks to enable lying about target name.
|
||||||
set -e; \
|
set -e; \
|
||||||
(cd $(STAGING_DIR); \
|
(cd $(STAGING_DIR)/usr; \
|
||||||
ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
|
ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
|
||||||
cd usr/bin; \
|
cd bin; \
|
||||||
for app in $(REAL_GNU_TARGET_NAME)-*; do \
|
for app in $(REAL_GNU_TARGET_NAME)-*; do \
|
||||||
ln -snf $${app} \
|
ln -snf $${app} \
|
||||||
$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
|
$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
|
||||||
|
@ -169,9 +169,9 @@ $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured
|
|||||||
|
|
||||||
$(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver
|
$(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver
|
||||||
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
|
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
|
||||||
mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
|
mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
|
||||||
install -c $(GDB_SERVER_DIR)/gdbserver \
|
install -c $(GDB_SERVER_DIR)/gdbserver \
|
||||||
$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/gdbserver
|
$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/gdbserver
|
||||||
endif
|
endif
|
||||||
install -c -D $(GDB_SERVER_DIR)/gdbserver $(TARGET_DIR)/usr/bin/gdbserver
|
install -c -D $(GDB_SERVER_DIR)/gdbserver $(TARGET_DIR)/usr/bin/gdbserver
|
||||||
|
|
||||||
|
@ -548,9 +548,9 @@ $(TARGET_DIR)/usr/bin/ldd: $(cross_compiler)
|
|||||||
CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \
|
CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \
|
||||||
PREFIX=$(TARGET_DIR) utils install_utils
|
PREFIX=$(TARGET_DIR) utils install_utils
|
||||||
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
|
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
|
||||||
mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
|
mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
|
||||||
install -c $(TARGET_DIR)/usr/bin/ldd \
|
install -c $(TARGET_DIR)/usr/bin/ldd \
|
||||||
$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/ldd
|
$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/ldd
|
||||||
endif
|
endif
|
||||||
touch -c $@
|
touch -c $@
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user