Skip to content

Build fails on Red Hat-like systems if TOUCH variable is defined as /usr... #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manul7 wants to merge 1 commit into
base: r8.a3-jb
Choose a base branch
from
Open

Build fails on Red Hat-like systems if TOUCH variable is defined as /usr... #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions WCS_Tools/cores_make/wlan.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ endif
cd $(WLAN_COMPAT_WIRELESS_DIR) ; \
sh ./scripts/admin-refresh.sh ; \
./scripts/driver-select ti
$(TOUCH) $(WLAN_COMPAT_WIRELESS_DIR)/drivers/net/Makefile
touch $(WLAN_COMPAT_WIRELESS_DIR)/drivers/net/Makefile
@$(ECHO) "...done"

wlan-make-private:
Expand All @@ -198,7 +198,7 @@ wlan-make-private:
cd $(WLAN_COMPAT_WIRELESS_DIR) ; \
sh ./scripts/admin-refresh.sh ; \
./scripts/driver-select ti
$(TOUCH) $(WLAN_COMPAT_WIRELESS_DIR)/drivers/net/Makefile
touch $(WLAN_COMPAT_WIRELESS_DIR)/drivers/net/Makefile
$(MAKE) -C $(WLAN_COMPAT_WIRELESS_DIR) KLIB=$(KERNEL_DIR) KLIB_BUILD=$(KERNEL_DIR) -j$(NTHREADS)
$(FIND) $(WLAN_COMPAT_WIRELESS_DIR) -name "*.ko" -exec $(COPY) {} $(WL12xx_KO_INSTALLER) \;
@$(ECHO) "...done"
Expand Down
4 changes: 2 additions & 2 deletions WCS_Tools/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ ifeq ($(CONFIG_WLAN), y)
$(COPY) $(WLAN_MANIFEST_DIR)/$(WLAN_ANDROID_MANIFEST_NAME) $(MYDROID)/.repo/$(WLAN_ANDROID_LOCAL_MANIFEST_NAME)
else
$(COPY) $(WIIST_PATH)/misc/empty_manifest.xml $(MYDROID)/.repo/$(WLAN_ANDROID_LOCAL_MANIFEST_NAME)
$(TOUCH) $(MYDROID)/.repo/$(WLAN_ANDROID_LOCAL_MANIFEST_NAME)
touch $(MYDROID)/.repo/$(WLAN_ANDROID_LOCAL_MANIFEST_NAME)
endif

$(PROGRESS_FETCH_BT_MANIFEST):
Expand Down Expand Up @@ -344,7 +344,7 @@ ifeq ($(CONFIG_BT), y)
$(COPY) $(BT_MANIFEST_DIR)/$(BT_ANDROID_MANIFEST_NAME) $(MYDROID)/.repo/$(BT_ANDROID_LOCAL_MANIFEST_NAME)
else
$(COPY) $(WIIST_PATH)/misc/empty_manifest.xml $(MYDROID)/.repo/$(BT_ANDROID_LOCAL_MANIFEST_NAME)
$(TOUCH) $(MYDROID)/.repo/$(BT_ANDROID_LOCAL_MANIFEST_NAME)
touch $(MYDROID)/.repo/$(BT_ANDROID_LOCAL_MANIFEST_NAME)
endif

gps-create-local-android-manifest:
Expand Down
1 change: 0 additions & 1 deletion WCS_Tools/utils.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ TAR:=/bin/tar
FIND:=/usr/bin/find
SED:=/bin/sed
MKFS_EXT4:=/sbin/mkfs.ext4
TOUCH:=/usr/bin/touch
GIT:=/usr/bin/git
CAT:=/bin/cat

Expand Down