summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--patches/mtr.midipix.patch28
-rw-r--r--vars/build.vars5
2 files changed, 32 insertions, 1 deletions
diff --git a/patches/mtr.midipix.patch b/patches/mtr.midipix.patch
new file mode 100644
index 00000000..a5ab92b1
--- /dev/null
+++ b/patches/mtr.midipix.patch
@@ -0,0 +1,28 @@
+diff -ru mtr.orig/Makefile.am mtr/Makefile.am
+--- mtr.orig/Makefile.am 2017-03-02 12:55:53.968328160 +0100
++++ mtr/Makefile.am 2017-03-02 13:02:10.645991226 +0100
+@@ -41,8 +41,8 @@
+ PATHFILES += man/mtr.8 man/mtr-packet.8
+
+ install-exec-hook:
+- `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \
+- || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet
++# `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \
++# || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet
+
+ mtr_SOURCES = ui/mtr.c ui/mtr.h \
+ ui/net.c ui/net.h \
+diff -ru mtr.orig/packet/platform.h mtr/packet/platform.h
+--- mtr.orig/packet/platform.h 2017-03-02 12:55:53.968328160 +0100
++++ mtr/packet/platform.h 2017-03-02 13:03:59.185316954 +0100
+@@ -40,6 +40,10 @@
+
+ #define PLATFORM_FREEBSD
+
++#elif defined(__midipix__)
++
++#define PLATFORM_MIDIPIX
++
+ #elif defined(__unix__)
+
+ #define PLATFORM_UNIX_UNKNOWN
diff --git a/vars/build.vars b/vars/build.vars
index 79e24406..31afa2c5 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -502,7 +502,7 @@ LEAF_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
LEAF_PACKAGES_PACKAGES="
apk_tools bash bash_flavour_minipix bc bdwgc bind chicken clang_host coreutils coreutils_flavour_minipix
cparser cron dash datamash diffutils dos2unix ed figlet file findutils gawk git gnupg grep hexcurse htop
-inetutils infounzip infozip irssi john ldns less lighttpd lynx make man_db mc mksh nano netcat nginx
+inetutils infounzip infozip irssi john ldns less lighttpd lynx make man_db mc mksh mtr nano netcat nginx
openlitespeed openssh p7zip pacman patch perl procps_ng python3 qpdf rsync rxvt_unicode sed smallbasic
tar tar_flavour_minipix tcsh the_silver_searcher tmux util_linux vim weechat wget which whois xeyes xwd zsh";
LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
@@ -545,6 +545,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
: ${PKG_COREUTILS_SHA256SUM:=155e94d748f8e2bc327c66e0cbebdb8d6ab265d2f37c3c928f7bf6c3beba9a8e};
: ${PKG_COREUTILS_VERSION:=8.26};
: ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
+: ${PKG_COREUTILS_MAKEFLAGS_BUILD_EXTRA:=V=99};
: ${PKG_COREUTILS_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
: ${PKG_COREUTILS_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"};
: ${PKG_COREUTILS_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}"};
@@ -700,6 +701,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
: ${PKG_MKSH_INSTALL_FILES:="mksh=bin/ /=share/doc/mksh/examples dot.mkshrc=share/doc/mksh/examples/ mksh.1=share/man/man1/"};
: ${PKG_MKSH_NO_MAKE_INSTALL:=1};
: ${PKG_MKSH_SUBDIR:=${PKG_MKSH_BUILD_DIR}};
+: ${PKG_MTR_URLS_GIT:="mtr.git=https://github.com/traviscross/mtr.git@master"};
+: ${PKG_MTR_BUILD_DIR:="mtr.git"};
: ${PKG_NANO_SHA256SUM:=b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee};
: ${PKG_NANO_VERSION:=2.5.3};
: ${PKG_NANO_URL:=http://www.nano-editor.org/dist/v${PKG_NANO_VERSION%.[0-9]}/nano-${PKG_NANO_VERSION}.tar.gz};