Skip to content

Commit b2aaf6d

Browse files
committed
* update to latest patch for 2.6.37
1 parent 65bf1fa commit b2aaf6d

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ image*
55
linux-2.6*
66
utf8-kernel-2.6-fonts-3.patch*
77
utf8-kernel-2.6.36-core-1.patch*
8+
utf8-kernel-2.6.37-core-1.patch*

linux-kernel-zh.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
ROOT="$( readlink -f $( dirname $(echo $0)) )"
88

9-
KERNEL_VERSION_TAG="v2.6.36"
9+
KERNEL_VERSION_TAG="v2.6.37"
1010
KERNEL_SOURCE_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git"
1111
KERNEL_SOURCE_GIT_DIR="$ROOT/linux-2.6"
1212

@@ -18,14 +18,14 @@ RESULT_DIR="$ROOT/image"
1818
INITRAMFS_DIR="$ROOT/image/_install"
1919

2020
ZH_PATCH_PREFIX="http://zdbr.net.cn/download/"
21-
ZH_PATCH10="utf8-kernel-2.6.36-core-1.patch.bz2"
22-
ZH_PATCH23="utf8-kernel-2.6-fonts-3.patch.bz2"
21+
ZH_PATCH1="utf8-kernel-2.6.37-core-1.patch.bz2"
22+
ZH_PATCH2="utf8-kernel-2.6-fonts-3.patch.bz2"
2323

2424
get_patch() {
2525
# TODO: would be better if we got md5sum as existance checing.
2626

27-
wget --continue $ZH_PATCH_PREFIX/$ZH_PATCH10
28-
wget --continue $ZH_PATCH_PREFIX/$ZH_PATCH23
27+
wget --continue $ZH_PATCH_PREFIX/$ZH_PATCH1
28+
wget --continue $ZH_PATCH_PREFIX/$ZH_PATCH2
2929

3030
for file in `ls *.bz2`
3131
do
@@ -123,14 +123,14 @@ build_kernel () {
123123
test -d $RESULT_DIR || mkdir -p $RESULT_DIR
124124

125125
pushd . ; cd $KERNEL_SOURCE_GIT_DIR
126-
#git fetch
127-
git reset && git checkout $KERNEL_VERSION_TAG
126+
git fetch
127+
git reset; git checkout $KERNEL_VERSION_TAG
128128
git checkout -- .
129129

130130
clean_file drivers/video/console/fonts_utf8.h # reset file
131131

132-
patch -N -d . -p1 < $ROOT/${ZH_PATCH10%.bz2}
133-
patch -N -d . -p1 < $ROOT/${ZH_PATCH23%.bz2}
132+
patch -N -d . -p1 < $ROOT/${ZH_PATCH1%.bz2}
133+
patch -N -d . -p1 < $ROOT/${ZH_PATCH2%.bz2}
134134

135135
make ARCH=x86 i386_defconfig
136136
patch_kernel_config ./.config
@@ -142,7 +142,7 @@ build_kernel () {
142142

143143
launch_image(){
144144
pushd . ; cd $RESULT_DIR
145-
qemu -kernel bzImage -append "vga=0x314"
145+
qemu -kernel bzImage -append "vga=0x314 root=/dev/ram0"
146146
popd
147147
}
148148

0 commit comments

Comments
 (0)