webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 19:55:52 +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
2016-04-20 16:24:12 +01:00
parent 32d91ecad8 c485f38c99
commit 9fcba2b5df
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3296,8 +3296,8 @@ CONFIG_UIO_PDRV_GENIRQ=m
#
CONFIG_STAGING=y
# CONFIG_USBIP_CORE is not set
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
# CONFIG_W35UND is not set
# CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set
# CONFIG_COMEDI is not set
# CONFIG_RTLLIB is not set
@@ -3965,7 +3965,7 @@ CONFIG_CRYPTO_AUTHENC=m
# Authenticated Encryption with Associated Data
#
CONFIG_CRYPTO_CCM=m
# CONFIG_CRYPTO_GCM is not set
CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_SEQIV=m
#

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

@@ -246,8 +246,8 @@ CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_CC_STACKPROTECTOR=y
CONFIG_CC_STACKPROTECTOR=y
# CONFIG_CC_STACKPROTECTOR_NONE is not set
# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_CC_STACKPROTECTOR_REGULAR=y
# CONFIG_CC_STACKPROTECTOR_STRONG is not set
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_HAVE_ARCH_SOFT_DIRTY=y

1
config/rootfiles/core/101/filelists/armv5tel/linux-rpi Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv5tel/linux-rpi

2
config/rootfiles/oldcore/100/exclude
View File

@@ -1,4 +1,6 @@
boot/config.txt
boot/grub/grub.cfg
boot/grub/grubenv
etc/alternatives
etc/collectd.custom
etc/default/grub

4
config/xen-image/xen-image-maker.sh
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2014 Arne Fitzenreiter <arne_f@ipfire.org> #
# Copyright (C) 2007-2016 Arne Fitzenreiter <arne_f@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -104,7 +104,7 @@ dd bs=1M if=/dev/zero of=$IMGvar count=$SIZEvar
mkfs.$FSTYPE -F $IMGvar
echo --------------------------------------------------------
echo - Intall IPFire to the Images ...
echo - Install IPFire to the images ...
echo --------------------------------------------------------
# Mount Images

2
lfs/linux
View File

@@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
PAK_VER = 67
PAK_VER = 68
DEPS = ""
KERNEL_ARCH = $(MACHINE)