include Config
-PATCHLEVEL = .21
-VER = 2.6.27.21
+PATCHLEVEL = .42
+VER = 2.6.27.42
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
CFLAGS =
CXXFLAGS =
-mISDN_VER = mISDN.git-ad5e8abaed89ce6539104b819eef011655cd0b04
+PROG = linux-xen
+PAK_VER = 7
+DEPS = ""
-# Normal build or SMP build.
+# Normal build or XEN build.
#
-ifeq "$(SMP)" "1"
- TARGET = $(DIR_INFO)/linux-$(VER)-smp
+ifeq "$(XEN)" "1"
+ VERSUFIX=ipfire-xen
else
- TARGET = $(DIR_INFO)/linux-$(VER)
+ VERSUFIX=ipfire
endif
+TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
###############################################################################
# Top-level Rules
###############################################################################
objects =$(DL_FILE) \
- $(mISDN_VER).tar.gz \
squashfs3.4.tar.gz \
netfilter-layer7-v2.21.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
- reiser4-for-2.6.27.19.patch.bz2
-
+ reiser4-for-2.6.27.19.patch.bz2 \
+ linux-$(VER)-suse_xen_patches-1.tar.bz2
+
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
netfilter-layer7-v2.21.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
-$(mISDN_VER).tar.gz = $(URL_IPFIRE)/$(mISDN_VER).tar.gz
reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
+linux-$(VER)-suse_xen_patches-1.tar.bz2 = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
+
-$(DL_FILE)_MD5 = 2912af7938fae1a3f2a9a6bcf8c0009f
+$(DL_FILE)_MD5 = a33e6b22d70dd010525fc43cdda36792
netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
-$(mISDN_VER).tar.gz_MD5 = 480a947458c3f254aba489a807f98a29
reiser4-for-2.6.27.19.patch.bz2_MD5 = 22988387f64f299489b90b484b2642cc
+linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = ddbde50f3bc303d947531402017a3055
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ln -s linux-$(VER) /usr/src/linux
- # Not report deprecated syscall 1.23 (for kudzu)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
-
- # Fix crash on Twinhead H12Y notebooks
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-h12y-mmio-quirks.patch
+ifeq "$(XEN)" "1"
+ # Apply Xen patches (provided by SuSE)
+ cd $(DIR_SRC) && tar jxf $(DIR_DL)/linux-$(VER)-suse_xen_patches-1.tar.bz2
+ cp -f $(DIR_SRC)/src/patches/suse_xen_series.conf $(DIR_SRC)/linux-$(VER)-suse_xen_patches/series.conf
+ cd $(DIR_SRC)/linux-$(VER)-suse_xen_patches && \
+ for x in $$( ./guards $$( ./arch-symbols) < ./series.conf); do \
+ echo "*********** [Patch: $$x]"; \
+ patch -d $(DIR_APP) -p1 < $$x || break; \
+ done
+ rm -rf $(DIR_SRC)/linux-*-suse_xen_patches
+
+ # Linux Intermediate Queueing Device
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/imq-skbuff.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3-xen.patch
+else
+ # Linux Intermediate Queueing Device
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3.patch
+endif
- # Openswan
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
+ # Add Vodafone K3565-Z USB ID's to option driver
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch
+ # Add Alix to Led Driver
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.24-leds-alix.patch
+
+ # Patch to fix Intel e100 wake on lan
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.39_e100-wakeonlan-fix.patch
+
+ # Not report deprecated syscall 1.23 (for kudzu)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
+ifeq "$(XEN)" ""
# Reiser4
- cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.27.19.patch.bz2 | patch -Np1
-
- # SquashFS
+ -cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.27.19.patch.bz2 | patch -Np1
+
+ # SquashFS (already in Suse Patchset)
cd $(DIR_SRC) && rm -rf squashfs*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.4.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.27-rc4/squashfs3.4-patch
-
- # ip_conntrack permissions from 440 to 444
-# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
+endif
# ipp2p 0.8.2-pomng
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.19-ipp2p-0.8.2-pomng.patch
+ # Intel Atom Coretemp Patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-atom-coretemp.patch
+
# Layer7-patch
cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.21
cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.21.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.21/kernel-2.6.25-2.6.28-layer7-2.21.patch
- # Linux Intermediate Queueing Device
-ifeq "$(XEN)" ""
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-imq.patch
-endif
-
- # remove mISDNv2 from Kernel (incomaptible to asterisk)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-disable_mISDNv2.patch
- cd $(DIR_APP) rm -rf drivers/isdn/mISDN drivers/isdn/hardware/mISDN
-
- # add mISDNv1.2
- cd $(DIR_SRC) && rm -rf mISDN-*
- cd $(DIR_SRC) && tar xfz $(DIR_DL)/$(mISDN_VER).tar.gz
- cd $(DIR_SRC)/mISDN.git && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-remove2.6.27-dsp-features.diff
- cd $(DIR_SRC)/mISDN.git && yes 'yes' | ./std2kern -k /usr/src/linux
-
# Cleanup kernel source
cd $(DIR_APP) && make mrproper
-ifeq "$(SMP)" "1"
- cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).smp $(DIR_APP)/.config
-else
- cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) $(DIR_APP)/.config
-endif
-
+ cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
cd $(DIR_APP) && make CC="$(KGCC)" clean
+ cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile
-ifeq "$(SMP)" "1"
- cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire-smp/' Makefile
- cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
- cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire-smp
- cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire-smp
- ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
- cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
- cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
- cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
+ifeq "$(XEN)" "1"
+ 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) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
- cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire
- cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire
- cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire
- ln -sf vmlinuz-$(VER)-ipfire /boot/vmlinuz-ipfire
- ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire
+ cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
+endif
+ cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
+ cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
+ ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX)
+ ln -sf System.map-$(VER)-$(VERSUFIX) /boot/System.map-$(VERSUFIX)
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
-endif
-ifeq "$(SMP)" ""
- # Only do this once on the non-SMP pass
+ifeq "$(XEN)" ""
+ # Only do this once on the non-XEN pass
cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
-endif
+endif
# Rename ide-cd module to match with old kernel
- mv /lib/modules/$(VER)-ipfire/kernel/drivers/ide/ide-cd_mod.ko \
- /lib/modules/$(VER)-ipfire/kernel/drivers/ide/ide-cd.ko
+ mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd_mod.ko \
+ /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd.ko
- @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
- @$(POSTBUILD)
+ # Remove mISDN modules
+ rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
+ rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
+ @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
+ @$(POSTBUILD)
projects / people / pmueller / ipfire-2.x.git / blobdiff