webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 19:15:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

kernel: updated omap kernel to 2.6.40.32 aka 3.0.32.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-05-23 13:34:39 +02:00
parent c74d2398dc
commit eaaf33b609
2 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/rootfiles/common/armv5tel/linux-omap
View File

@@ -1,5 +1,5 @@
boot/uInit-ipfire-omap
boot/uImage-ipfire-omap
boot/System.map-2.6.40.30-ipfire-omap
boot/config-2.6.40.30-ipfire-omap
lib/modules/2.6.40.30-ipfire-omap
boot/System.map-2.6.40.32-ipfire-omap
boot/config-2.6.40.32-ipfire-omap
lib/modules/2.6.40.32-ipfire-omap

46
lfs/linux3
View File

@@ -24,14 +24,14 @@
include Config
PATCHLEVEL = .30
VER = 2.6.40.30
PATCHLEVEL = .32
VER = 2.6.40.32
XVERS = 3.0.30
XVERS = 3.0.32
XVERSION = 2
XPATCHLEVEL = 6
XSUBLEVEL = 40
XEXTRAVERSION = .30
XEXTRAVERSION = .32
THISAPP = linux-$(VER)
DL_FILE = linux-$(XVERS).tar.bz2
@@ -43,9 +43,6 @@ CXXFLAGS =
PAK_VER = 20
DEPS = ""
# Normal build or XEN build.
#
VERSUFIX=ipfire$(KCFG)
ifeq "$(HEADERS)" "1"
@@ -77,19 +74,13 @@ endif
# Top-level Rules
###############################################################################
objects =$(DL_FILE) \
patch-2.6.16-nath323-1.3.bz2 \
reiser4-for-2.6.32.patch.bz2 \
xen-patches-2.6.32-2f.tar.bz2
patch-2.6.16-nath323-1.3.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
$(DL_FILE)_MD5 = fbd04e3f1060dc71ebbf0cb644ae1573
$(DL_FILE)_MD5 = 67ae0ca4e87fb22cecfce94cb90eaee9
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91
xen-patches-2.6.32-2f.tar.bz2_MD5 = b59d6f89e11accb9d40354418e13f31b
install : $(TARGET)
@@ -120,7 +111,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
# Change version from 3.x to 2.6.4x
cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^VERSION =.*$$/VERSION = $(XVERSION)/g" Makefile
@@ -131,30 +122,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -svf linux-$(VER) $(DIR_SRC)/linux
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
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-3.1-imq.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 (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-ipfire
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.0-ipp2p-0.8.2-ipfire.patch
@@ -211,10 +184,6 @@ else
cd $(DIR_APP) && make CC="$(KGCC)" clean
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile
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
ifeq "$(KCFG)" "-kirkwood"
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage
cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
@@ -233,7 +202,6 @@ else
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
endif
endif
endif
endif
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)