mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 01:03:20 +02:00
more portability fixes and a prereq check for gnu tar
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5037 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
9a66e2ac6a
commit
3dcf8b9e33
@ -7,6 +7,8 @@
|
||||
|
||||
include $(TOPDIR)/.host.mk
|
||||
|
||||
export TAR
|
||||
|
||||
$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk
|
||||
@( \
|
||||
HOST_OS=`uname`; \
|
||||
@ -23,5 +25,7 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk
|
||||
if tar --version 2>&1 | grep 'GNU' >/dev/null; then \
|
||||
echo "TAR_WILDCARDS:=--wildcards" >> $@; \
|
||||
fi; \
|
||||
TAR=`which gtar tar | head -n 1`; \
|
||||
echo "TAR:=$$TAR" >> $@; \
|
||||
)
|
||||
|
||||
|
@ -8,6 +8,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
TMP_DIR:=$(TOPDIR)/tmp
|
||||
include $(INCLUDE_DIR)/prereq.mk
|
||||
include $(INCLUDE_DIR)/host.mk
|
||||
|
||||
define Require/non-root
|
||||
[ "$$(shell whoami)" != "root" ]
|
||||
@ -94,3 +95,11 @@ $(eval $(call RequireCommand,patch, \
|
||||
$(eval $(call RequireCommand,perl, \
|
||||
Please install perl. \
|
||||
))
|
||||
|
||||
define Require/gnutar
|
||||
$(TAR) --version 2>&1 | grep GNU > /dev/null
|
||||
endef
|
||||
|
||||
$(eval $(call Require,gnutar, \
|
||||
Please install GNU tar. \
|
||||
))
|
||||
|
1
rules.mk
1
rules.mk
@ -6,6 +6,7 @@
|
||||
#
|
||||
|
||||
-include $(TOPDIR)/.config
|
||||
include $(TOPDIR)/include/host.mk
|
||||
include $(TOPDIR)/include/verbose.mk
|
||||
|
||||
export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
BASE=http://svn.openwrt.org/openwrt/trunk/openwrt
|
||||
TARGET=$1
|
||||
CONTROL=$2
|
||||
|
Loading…
Reference in New Issue
Block a user