diff options
| author | Fanjun Kong <[email protected]> | 2020-10-15 16:41:19 +0800 |
|---|---|---|
| committer | Fanjun Kong <[email protected]> | 2020-10-15 16:41:19 +0800 |
| commit | 7eaec01b7065abcf3e793038228ee897bb3c6e5a (patch) | |
| tree | 15a0207e35c06c6d8d3c28c87cf5bac1181ace5c /Makefile | |
| parent | f20027d077c7ba4d5def66e0fc0cb64c33057e9b (diff) | |
fix build failed on aarch64 Ubuntu 16.04.
Signed-off-by: Fanjun Kong <[email protected]>
Acked-by: Baoyou Xie <[email protected]>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -1,9 +1,10 @@ CWD = $(shell pwd) +ARCH := $(shell uname -i) UNAME_A := $(shell uname -a) all: module tools java_agent pkg -ifneq ($(findstring Ubuntu,$(UNAME_A)),) +ifneq ($(findstring Ubuntu,$(UNAME_A) $(shell test -e /etc/os-release && head -1 /etc/os-release)),) dpkg -P diagnose-tools || echo "remove diagnose-tools error" cd rpmbuild; sudo dpkg -i diagnose-tools*.deb else @@ -64,11 +65,15 @@ java_agent: pkg: cd rpmbuild; sh rpmbuild.sh ls rpmbuild/RPMS/*/* -ifneq ($(findstring Ubuntu,$(UNAME_A)),) +ifneq ($(findstring Ubuntu,$(UNAME_A) $(shell test -e /etc/os-release && head -1 /etc/os-release)),) #sudo dpkg-reconfigure dash !!!!!!!!!!!!!!!!!!!!!!!!!!!!! cd rpmbuild; rm -f diagnose-tools*.deb +ifneq ($(findstring aarch64,$(ARCH)),) + cd rpmbuild; sudo alien -d --target=arm64 ./RPMS/aarch64/diagnose-tools*.rpm +else cd rpmbuild; sudo alien -d ./RPMS/x86_64/diagnose-tools*.rpm endif +endif test: modprobe ext4 |