# Fix installation on partial rebuild, so modules install where they should
# and not everytime on the last compiled kernel
if [ -f $(DIR_SRC)/linux-$(KVER) ]; then \
- if [ "$(PAE)" = "1" ]; then \
- cd $(DIR_SRC)/linux-$(KVER) && \
- sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-pae+' Makefile; \
- elif [ "$(XEN)" = "" ]; then \
- cd $(DIR_SRC)/linux-$(KVER) && \
- sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire+' Makefile; \
- else \
- cd $(DIR_SRC)/linux-$(KVER) && \
- sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-xen+' Makefile; \
- fi; \
+ cd $(DIR_SRC)/linux-$(KVER) && \
+ sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire$(KCFG)+' Makefile; \
fi
endef
else
# $(TARGET)_rootfile : ROOTFILE with KVER replacement
# $(TARGET) : log result with {commented|include|added} files
if [ -s "$(TARGET)_diff" ]; then \
- if [ "$(PAE)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-pae; \
- elif [ "$(XEN)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-xen; \
- else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
- fi; \
+ LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))$(KCFG); \
echo $(LFS_SCRIPT); \
ROOTFILE=$$(find $(DIR_SRC)/config/rootfiles/{common,packages}/{$(MACHINE),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
if [ "$$ROOTFILE" = "" ]; then \
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX=ipfire-xen
-else
- VERSUFIX=ipfire
-endif
-endif
VER = 1.0.24.1
UVER = 1.0.24.2
FVER = 1.0.24.1
DVER = 1.0.24
+VERSUFIX = ipfire$(KCFG)
+
THISAPP = alsa-lib-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX=ipfire-xen
-else
- VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
VER = 3.0-2
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@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 #
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX=ipfire-xen
-else
- VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
VER = 20091126
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2011 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@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 #
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX=ipfire-xen
-else
- VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
VER = 2.2.1
TVER = 2.2.1
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX = ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX = ipfire-xen
-else
- VERSUFIX = ipfire
-endif
-endif
+VERSUFIX = ipfire$(KCFG)
VER = 8.0.30
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX = ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX = ipfire-xen
-else
- VERSUFIX = ipfire
-endif
-endif
+VERSUFIX = ipfire$(KCFG)
VER = 1.3.10a
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX = ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX = ipfire-xen
-else
- VERSUFIX = ipfire
-endif
-endif
+VERSUFIX = ipfire$(KCFG)
VER = 3.0.19
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@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 #
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX=ipfire-xen
-else
- VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
VER = 1.4.0pre1
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@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 #
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX=ipfire-xen
-else
- VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
VER = 3.0b
# Normal build or XEN build.
#
-ifeq "$(PAE)" "1"
- VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX=ipfire-xen
-else
- VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
ifeq "$(HEADERS)" "1"
ifeq "$(TOOLS)" "1"
ln -svf linux-$(VER) $(DIR_SRC)/linux
-ifeq "$(XEN)" "1"
+ifeq "$(KCFG)" "-xen"
# Apply gentoo Xen patches
mkdir -p $(DIR_SRC)/xen-patches
cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2
cd $(DIR_APP) && make CC="$(KGCC)" clean
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile
-ifeq "$(XEN)" "1"
+ifeq "$(KCFG)" "-xen"
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX)
else
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
-ifneq "$(PAE)" "1"
-ifneq "$(XEN)" "1"
+ifeq "$(KCFG)" ""
# Only do this once on the standard kernel pass
cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
# Disable ipv6 at runtime
echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6
-endif
endif
# Remove mISDN modules
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@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 #
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX=ipfire-xen
-else
- VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
VER = 20100525
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@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 #
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX=ipfire-pae
-else
-
-ifeq "$(XEN)" "1"
- VERSUFIX=ipfire-xen
-else
- VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
VER = hal-0.10.5.6-r4119-20100201
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@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 #
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX = ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX = ipfire-xen
-else
- VERSUFIX = ipfire
-endif
-endif
+VERSUFIX = ipfire$(KCFG)
VER = 1.019.00
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@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 #
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX = ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX = ipfire-xen
-else
- VERSUFIX = ipfire
-endif
-endif
+VERSUFIX = ipfire$(KCFG)
VER = 8.019.00
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@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 #
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX = ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX = ipfire-xen
-else
- VERSUFIX = ipfire
-endif
-endif
+VERSUFIX = ipfire$(KCFG)
VER = 6.014.00
include Config
-ifeq "$(PAE)" "1"
- VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
- VERSUFIX=ipfire-xen
-else
- VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
VER = git20110427
# The xen and PAE kernels are only available for x86
if [ "${MACHINE_TYPE}" != "arm" ]; then
- ipfiremake linux XEN=1
- ipfiremake kqemu XEN=1
- ipfiremake v4l-dvb XEN=1
- ipfiremake madwifi XEN=1
- ipfiremake mISDN XEN=1
- ipfiremake dahdi XEN=1 KMOD=1
- ipfiremake cryptodev XEN=1
- ipfiremake compat-wireless XEN=1
- ipfiremake r8169 XEN=1
- ipfiremake r8168 XEN=1
- ipfiremake r8101 XEN=1
- ipfiremake e1000 XEN=1
- ipfiremake e1000e XEN=1
- ipfiremake igb XEN=1
- ipfiremake linux PAE=1
- ipfiremake kqemu PAE=1
- ipfiremake kvm-kmod PAE=1
- ipfiremake v4l-dvb PAE=1
- ipfiremake madwifi PAE=1
- ipfiremake alsa PAE=1 KMOD=1
- ipfiremake mISDN PAE=1
- ipfiremake dahdi PAE=1 KMOD=1
- ipfiremake cryptodev PAE=1
- ipfiremake compat-wireless PAE=1
-# ipfiremake r8169 PAE=1
-# ipfiremake r8168 PAE=1
-# ipfiremake r8101 PAE=1
- ipfiremake e1000 PAE=1
- ipfiremake e1000e PAE=1
- ipfiremake igb PAE=1
+ ipfiremake linux KCFG="-xen"
+ ipfiremake kqemu KCFG="-xen"
+ ipfiremake v4l-dvb KCFG="-xen"
+ ipfiremake madwifi KCFG="-xen"
+ ipfiremake mISDN KCFG="-xen"
+ ipfiremake dahdi KCFG="-xen" KMOD=1
+ ipfiremake cryptodev KCFG="-xen"
+ ipfiremake compat-wireless KCFG="-xen"
+ ipfiremake r8169 KCFG="-xen"
+ ipfiremake r8168 KCFG="-xen"
+ ipfiremake r8101 KCFG="-xen"
+ ipfiremake e1000 KCFG="-xen"
+ ipfiremake e1000e KCFG="-xen"
+ ipfiremake igb KCFG="-xen"
+ ipfiremake linux KCFG="-pae"
+ ipfiremake kqemu KCFG="-pae"
+ ipfiremake kvm-kmod KCFG="-pae"
+ ipfiremake v4l-dvb KCFG="-pae"
+ ipfiremake madwifi KCFG="-pae"
+ ipfiremake alsa KCFG="-pae" KMOD=1
+ ipfiremake mISDN KCFG="-pae"
+ ipfiremake dahdi KCFG="-pae" KMOD=1
+ ipfiremake cryptodev KCFG="-pae"
+ ipfiremake compat-wireless KCFG="-pae"
+# ipfiremake r8169 KCFG="-pae"
+# ipfiremake r8168 KCFG="-pae"
+# ipfiremake r8101 KCFG="-pae"
+ ipfiremake e1000 KCFG="-pae"
+ ipfiremake e1000e KCFG="-pae"
+ ipfiremake igb KCFG="-pae"
fi
# Default kernel build
- ipfiremake linux
- ipfiremake v4l-dvb
- ipfiremake kqemu
- ipfiremake kvm-kmod
- ipfiremake madwifi
+ ipfiremake linux KCFG=""
+ ipfiremake v4l-dvb KCFG=""
+ ipfiremake kqemu KCFG=""
+ ipfiremake kvm-kmod KCFG=""
+ ipfiremake madwifi KCFG=""
if [ "${MACHINE_TYPE}" != "arm" ]; then
#todo enable alsa driver in kernel config
- ipfiremake alsa KMOD=1
+ ipfiremake alsa KCFG="" KMOD=1
fi
#undefined declaration in echo canceler try to fix later
- ipfiremake mISDN
- ipfiremake dahdi KMOD=1
- ipfiremake cryptodev
- ipfiremake compat-wireless
-# ipfiremake r8169
-# ipfiremake r8168
-# ipfiremake r8101
- ipfiremake e1000
- ipfiremake e1000e
- ipfiremake igb
+ ipfiremake mISDN KCFG=""
+ ipfiremake dahdi KCFG="" KMOD=1
+ ipfiremake cryptodev KCFG=""
+ ipfiremake compat-wireless KCFG=""
+# ipfiremake r8169 KCFG=""
+# ipfiremake r8168 KCFG=""
+# ipfiremake r8101 KCFG=""
+ ipfiremake e1000 KCFG=""
+ ipfiremake e1000e KCFG=""
+ ipfiremake igb KCFG=""
ipfiremake pkg-config
ipfiremake linux-atm
ipfiremake cpio