webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Michael Tremer
2014-03-01 14:19:26 +01:00
parent 3e5e8a4a88 c6f96750ba
commit 1db04adbef
8 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/kernel/kernel.config.armv5tel-ipfire-kirkwood
View File

@@ -4252,7 +4252,8 @@ CONFIG_USBIP_HOST=m
# CONFIG_RTL8192U is not set # CONFIG_RTL8192U is not set
# CONFIG_RTLLIB is not set # CONFIG_RTLLIB is not set
# CONFIG_R8712U is not set # CONFIG_R8712U is not set
# CONFIG_RTS5139 is not set CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set # CONFIG_TRANZPORT is not set
# CONFIG_IDE_PHISON is not set # CONFIG_IDE_PHISON is not set
# CONFIG_LINE6_USB is not set # CONFIG_LINE6_USB is not set

3
config/kernel/kernel.config.armv5tel-ipfire-multi
View File

@@ -4564,7 +4564,8 @@ CONFIG_USBIP_HOST=m
# CONFIG_RTL8192U is not set # CONFIG_RTL8192U is not set
# CONFIG_RTLLIB is not set # CONFIG_RTLLIB is not set
# CONFIG_R8712U is not set # CONFIG_R8712U is not set
# CONFIG_RTS5139 is not set CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set # CONFIG_TRANZPORT is not set
# CONFIG_IDE_PHISON is not set # CONFIG_IDE_PHISON is not set
# CONFIG_LINE6_USB is not set # CONFIG_LINE6_USB is not set

3
config/kernel/kernel.config.armv5tel-ipfire-rpi
View File

@@ -3456,7 +3456,8 @@ CONFIG_ECHO=m
# CONFIG_PANEL is not set # CONFIG_PANEL is not set
# CONFIG_RTLLIB is not set # CONFIG_RTLLIB is not set
# CONFIG_R8712U is not set # CONFIG_R8712U is not set
# CONFIG_RTS5139 is not set CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set # CONFIG_TRANZPORT is not set
# CONFIG_LINE6_USB is not set # CONFIG_LINE6_USB is not set
# CONFIG_USB_SERIAL_QUATECH2 is not set # CONFIG_USB_SERIAL_QUATECH2 is not set

3
config/kernel/kernel.config.i586-ipfire
View File

@@ -4678,7 +4678,8 @@ CONFIG_ECHO=m
# CONFIG_RTL8192U is not set # CONFIG_RTL8192U is not set
# CONFIG_RTLLIB is not set # CONFIG_RTLLIB is not set
# CONFIG_R8712U is not set # CONFIG_R8712U is not set
# CONFIG_RTS5139 is not set CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set # CONFIG_TRANZPORT is not set
# CONFIG_IDE_PHISON is not set # CONFIG_IDE_PHISON is not set
# CONFIG_LINE6_USB is not set # CONFIG_LINE6_USB is not set

3
config/kernel/kernel.config.i586-ipfire-pae
View File

@@ -4718,7 +4718,8 @@ CONFIG_ECHO=m
# CONFIG_RTL8192U is not set # CONFIG_RTL8192U is not set
# CONFIG_RTLLIB is not set # CONFIG_RTLLIB is not set
# CONFIG_R8712U is not set # CONFIG_R8712U is not set
# CONFIG_RTS5139 is not set CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set # CONFIG_TRANZPORT is not set
# CONFIG_IDE_PHISON is not set # CONFIG_IDE_PHISON is not set
# CONFIG_LINE6_USB is not set # CONFIG_LINE6_USB is not set

4
lfs/ffmpeg
View File

@@ -31,12 +31,12 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ffmpeg PROG = ffmpeg
PAK_VER = 4 PAK_VER = 5
DEPS = "ffmpeg-libs sdl lame libvorbis xvid" DEPS = "ffmpeg-libs sdl lame libvorbis xvid"
# Don't use PIC for libavcodec # Don't use PIC for libavcodec
CFLAGS += -fno-PIC -fno-strict-aliasing CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules

2
lfs/ffmpeg-libs
View File

@@ -27,7 +27,7 @@ include Config
VER = 2008-04-13 VER = 2008-04-13
THISAPP = ffmpeg-export-$(VER) THISAPP = ffmpeg-export-$(VER)
PROG = ffmpeg-libs PROG = ffmpeg-libs
PAK_VER = 4 PAK_VER = 5
DEPS = "" DEPS = ""

4
lfs/libmad
View File

@@ -32,10 +32,12 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libmad PROG = libmad
PAK_VER = 1 PAK_VER = 2
DEPS = "" DEPS = ""
CFLAGS += -Wa,--noexecstack
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules
############################################################################### ###############################################################################