mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 11:13:24 +02:00
Merge remote-tracking branch 'origin/core120' into kernel-4.14
This commit is contained in:
1
lfs/dma
1
lfs/dma
@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
touch /var/ipfire/dma/mail.conf
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-authentication.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-tls.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.11-compile-fixes.patch
|
||||
cd $(DIR_APP) && sed -i '/PREFIX/s/usr\/local/usr/g' Makefile
|
||||
cd $(DIR_APP) && sed -i '/CONFDIR/s/etc\/dma/var\/ipfire\/dma/g' Makefile
|
||||
cd $(DIR_APP) && make
|
||||
|
||||
2
lfs/htop
2
lfs/htop
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = htop
|
||||
PAK_VER = 10
|
||||
PAK_VER = 11
|
||||
|
||||
DEPS = ""
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = iptraf-ng
|
||||
PAK_VER = 2
|
||||
PAK_VER = 3
|
||||
|
||||
DEPS = ""
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/lcd4linux
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = lcd4linux
|
||||
PAK_VER = 5
|
||||
PAK_VER = 6
|
||||
|
||||
DEPS = "dpfhack libmpdclient"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user