Quellcode durchsuchen

fix

tags/v0.0.59
Peter Vivell vor 6 Jahren
Ursprung
Commit
449f84c1c4
2 geänderte Dateien mit 11 neuen und 3 gelöschten Zeilen
  1. 4
    2
      Makefile
  2. 7
    1
      drone.yml

+ 4
- 2
Makefile Datei anzeigen

@@ -4,6 +4,8 @@ SUBDIRS = src src/contrib
4 4
 SUBDIRGOALS := all
5 5
 SUBDIRSCLEAN=$(addsuffix -clean,$(SUBDIRS))
6 6
 
7
+STRIP ?= strip
8
+
7 9
 all: $(SUBDIRS) dist
8 10
 
9 11
 $(TARGETS): $(SUBDIRS)
@@ -17,10 +19,10 @@ $(SUBDIRS):
17 19
 dist:
18 20
 	mkdir -p dist/opt/radangel
19 21
 	cp -p src/radangel dist/opt/radangel/radangel
20
-	strip -s dist/opt/radangel/radangel
22
+	$(STRIP) -s dist/opt/radangel/radangel
21 23
 	mkdir -p dist/opt/websockify
22 24
 	cp -p src/contrib/websockify dist/opt/websockify/websockify
23
-	strip -s dist/opt/websockify/websockify
25
+	$(STRIP) -s dist/opt/websockify/websockify
24 26
 	mkdir -p dist/etc/systemd/system
25 27
 	cp -p service/*.service dist/etc/systemd/system/
26 28
 	mkdir -p dist/var/www/html/gamma

+ 7
- 1
drone.yml Datei anzeigen

@@ -80,7 +80,13 @@ steps:
80 80
         tar -xf "$${PKG_RELEASE_DIR}/$${PKG_DEB_ARCHIVE}" -C "$${PKG_BUILD_DIR}" --strip 1 &&
81 81
         cd "$${PKG_BUILD_DIR}" &&
82 82
         export MAKEFLAGS="$${MAKEFLAGS}" &&
83
-        [ "$${PKG_ARCH}" -ne "$${PKG_BUILDHOST_ARCH}" ] && export CC="arm-linux-gnueabihf-gcc" || true &&
83
+        [ "$${PKG_ARCH}" -ne "$${PKG_BUILDHOST_ARCH}" ] && ( \
84
+          export CC="arm-linux-gnueabihf-gcc" ; \
85
+          export LD="arm-linux-gnueabihf-ld" ; \
86
+          export STRIP="arm-linux-gnueabihf-strip" ; \
87
+        ) || ( \
88
+          echo "native build" \
89
+        ) &&
84 90
         make &&
85 91
         tar --exclude='./.*'
86 92
           --transform "s/\./$${PKG_RELEASE_ARCHIVE_ROOT}/"

Laden…
Abbrechen
Speichern