include Config
-PATCHLEVEL = .25
-VER = 2.6.27.25
+PATCHLEVEL = .15
+VER = 2.6.32.15
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
CXXFLAGS =
PROG = linux-xen
-PAK_VER = 4
+PAK_VER = 10
DEPS = ""
# Normal build or XEN build.
#
-VERSUFIX=ipfire
+
+ifeq "$(XEN)" "1"
+ VERSUFIX=ipfire-xen
+else
+ VERSUFIX=ipfire
+endif
+
TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
###############################################################################
# Top-level Rules
###############################################################################
objects =$(DL_FILE) \
- squashfs3.4.tar.gz \
- netfilter-layer7-v2.21.tar.gz \
+ netfilter-layer7-v2.22.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
- reiser4-for-2.6.27.19.patch.bz2
-
+ reiser4-for-2.6.32.patch.bz2 \
+ squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \
+ xen-patches-2.6.32-2.tar.bz2
+
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
-netfilter-layer7-v2.21.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
+netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.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
-reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
+reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
+squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2
+xen-patches-2.6.32-2.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2.tar.bz2
-$(DL_FILE)_MD5 = 5d6dcff157f30d742c9ee28ad4589779
-netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
+$(DL_FILE)_MD5 = 1cbbf16e93bbe03368172872690600c0
+netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
-squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
-reiser4-for-2.6.27.19.patch.bz2_MD5 = 22988387f64f299489b90b484b2642cc
+reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91
+squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4
+xen-patches-2.6.32-2.tar.bz2_MD5 = d1d78d2e9b9b62dd869a490f4415de04
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
+ifeq "$(XEN)" "1"
+ # Apply gentoo Xen patches
+ mkdir -p $(DIR_SRC)/xen-patches
+ cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2.tar.bz2
+
+ for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
+ echo "*********** [Patch: $$x]"; \
+ cd $(DIR_APP) && pwd && patch -Np1 < $$x || exit 1; \
+ done
+ rm -rf $(DIR_SRC)/xen-patches
+
+ # Linux Intermediate Queueing Device
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-imq-test2.patch
+else
# Linux Intermediate Queueing Device
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
+endif
# 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
-
- # Reiser4
- cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.27.19.patch.bz2 | patch -Np1
-
- # SquashFS
- 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
+
+ # Reiser4 (don't check if fail (some patches are already in xen patchset)
+ -cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
# 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
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.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
+ cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.22
+ cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.22/kernel-2.6.25-2.6.28-layer7-2.22.patch
+
+ # Squashfs LZMA support
+ cd $(DIR_APP) && bzcat $(DIR_DL)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 | patch -Np1
+
+ # Add some more LED triggers
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch
+
+ # Huawei (Vodafone) K3765 & K4505 Usbids
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch
+
+ # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
# Cleanup kernel source
- cd $(DIR_APP) && make mrproper
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 "$(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) && make $(MAKETUNING) CC="$(KGCC)" bzImage
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)
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
+ifeq "$(XEN)" ""
# Only do this once on the non-XEN pass
cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
+endif
# Rename ide-cd module to match with old kernel
mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd_mod.ko \
/lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd.ko
+ mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-gd_mod.ko \
+ /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-disk.ko
# Remove mISDN modules
rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
+ifneq "$(XEN)" "1"
+ # Blacklist matroxfb_base
+ echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer
+ # Blacklist old framebuffer modules
+ for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \
+ echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
+ done
+ # Blacklist new drm framebuffer modules
+ for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/*.ko); do \
+ echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
+ done
+ sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer
+
+ # Blacklist isdn modules
+ for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
+ echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
+ done
+ sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
+endif
+
@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