kopia lustrzana https://github.com/weetmuts/wmbusmeters
Build fix.
rodzic
aab9b11e83
commit
eab0e9f940
|
@ -12,8 +12,7 @@ The program runs on GNU/Linux, MacOSX, FreeBSD, and Raspberry Pi.
|
||||||
| OS | Status |
|
| OS | Status |
|
||||||
| ------------ |:-------------:|
|
| ------------ |:-------------:|
|
||||||
|GNU/Linux & MacOSX| [![Build Status](https://travis-ci.org/weetmuts/wmbusmeters.svg?branch=master)](https://travis-ci.org/weetmuts/wmbusmeters) |
|
|GNU/Linux & MacOSX| [![Build Status](https://travis-ci.org/weetmuts/wmbusmeters.svg?branch=master)](https://travis-ci.org/weetmuts/wmbusmeters) |
|
||||||
|
|Arm versions|[![CircleCI>](https://circleci.com/gh/weetmuts/wmbusmeters.svg?style=svg)](https://circleci.com/gh/weetmuts/workflows/wmbusmeters)|
|
||||||
|arm versions|[![CircleCI>](https://circleci.com/gh/weetmuts/wmbusmeters.svg?style=svg)](https://circleci.com/gh/weetmuts/workflows/wmbusmeters)|
|
|
||||||
|
|
||||||
|
|
||||||
| Static Scan | Status |
|
| Static Scan | Status |
|
||||||
|
|
|
@ -9,7 +9,7 @@ RUN make release && chmod 755 build/rtl_wmbus
|
||||||
|
|
||||||
FROM multiarch/alpine:amd64-latest-stable as scratch
|
FROM multiarch/alpine:amd64-latest-stable as scratch
|
||||||
ENV QEMU_EXECVE=1
|
ENV QEMU_EXECVE=1
|
||||||
RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr ncurses
|
RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr
|
||||||
WORKDIR /wmbusmeters
|
WORKDIR /wmbusmeters
|
||||||
COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters
|
COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters
|
||||||
COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus
|
COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus
|
||||||
|
|
|
@ -23,12 +23,7 @@
|
||||||
#include <memory.h>
|
#include <memory.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#if defined(__APPLE__) && defined(__MACH__) or defined(__FreeBSD__)
|
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#else
|
|
||||||
#include <wait.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
void invokeShell(string program, vector<string> args, vector<string> envs)
|
void invokeShell(string program, vector<string> args, vector<string> envs)
|
||||||
|
|
Ładowanie…
Reference in New Issue