webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +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
2015-09-14 23:32:51 +01:00
parent f62ac3224c 253983268e
commit 1ca232eb4c
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lfs/pakfire
View File

@@ -30,10 +30,10 @@ THISAPP = pakfire
DIR_APP = /opt/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
ifeq "$(MACHINE_TYPE)" "arm"
PAKFIRE_VERSION = $(VERSION)-$(MACHINE)
else
ifeq "$(MACHINE)" "i586"
PAKFIRE_VERSION = $(VERSION)
else
PAKFIRE_VERSION = $(VERSION)-$(MACHINE)
endif
###############################################################################

35
make.sh
View File

@@ -86,21 +86,6 @@ if [ -z $EDITOR ]; then
[ -z $EDITOR ] && exiterror "You should have installed an editor."
fi
# Prepare string for /etc/system-release.
SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})"
if [ "$(git status -s | wc -l)" == "0" ]; then
GIT_STATUS=""
else
GIT_STATUS="-dirty"
fi
case "$GIT_BRANCH" in
core*|beta?|rc?)
SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
;;
*)
SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
;;
esac
prepareenv() {
############################################################################
@@ -240,6 +225,22 @@ prepareenv() {
# Remove pre-install list of installed files in case user erase some files before rebuild
rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
# Prepare string for /etc/system-release.
SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})"
if [ "$(git status -s | wc -l)" == "0" ]; then
GIT_STATUS=""
else
GIT_STATUS="-dirty"
fi
case "$GIT_BRANCH" in
core*|beta?|rc?)
SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
;;
*)
SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
;;
esac
}
buildtoolchain() {
@@ -420,10 +421,10 @@ buildipfire() {
case "${TARGET_ARCH}" in
x86_64)
ipfiremake linux KCFG=""
ipfiremake backports KCFG=""
# ipfiremake backports KCFG=""
ipfiremake cryptodev KCFG=""
ipfiremake e1000e KCFG=""
# ipfiremake igb KCFG=""
ipfiremake igb KCFG=""
ipfiremake ixgbe KCFG=""
ipfiremake xtables-addons KCFG=""
ipfiremake linux-initrd KCFG=""