webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2020-09-24 14:16:16 +00:00
parent 90a90bc1db 0f7a8e02c7
commit 962f7923f5
6 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/oldcore/149/update.sh
View File

@@ -43,6 +43,9 @@ extract_files
# update linker config # update linker config
ldconfig ldconfig
# Restart init to allow clean unmout at reboot
telinit u
# Update Language cache # Update Language cache
/usr/local/bin/update-lang-cache /usr/local/bin/update-lang-cache

2
lfs/binutils
View File

@@ -51,6 +51,8 @@ ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS)) CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS)) CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS)) CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
TARGET = $(DIR_INFO)/$(THISAPP)-tools1 TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = \ EXTRA_CONFIG = \

5
lfs/ccache
View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # 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 # # it under the terms of the GNU General Public License as published by #
@@ -34,10 +34,13 @@ TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
ifeq "$(PASS)" "1" ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -march=%,,$(CFLAGS)) CFLAGS := $(patsubst -march=%,,$(CFLAGS))
CFLAGS := $(patsubst -mtune=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS)) CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS)) CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS)) CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS)) CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
endif endif
############################################################################### ###############################################################################

4
lfs/gcc
View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # 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 # # it under the terms of the GNU General Public License as published by #
@@ -44,6 +44,8 @@ CFLAGS := $(filter-out -fexceptions,$(CFLAGS))
ifeq "$(PASS)" "1" ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS)) CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS)) CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
endif endif
CXXFLAGS := $(CFLAGS) CXXFLAGS := $(CFLAGS)

2
lfs/glibc
View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # 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 # # it under the terms of the GNU General Public License as published by #

4
make.sh
View File

@@ -39,7 +39,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch
GIT_TAG="$(git tag | tail -1)" # Git Tag GIT_TAG="$(git tag | tail -1)" # Git Tag
GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit
TOOLCHAINVER=20200814 TOOLCHAINVER=20200924
############################################################################### ###############################################################################
# #
@@ -153,7 +153,7 @@ configure_build() {
BUILDTARGET="${build_arch}-pc-linux-gnu" BUILDTARGET="${build_arch}-pc-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu" CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="x86" BUILD_PLATFORM="x86"
CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer -fcf-protection" CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
;; ;;
aarch64) aarch64)