diff --git a/patch.sh b/patch.sh index df743a3f07813bf28bb5e99a56d44ab3ace57e5a..a7f420d8e89df4788ca8f236d0d10835828e2e30 100644 --- a/patch.sh +++ b/patch.sh @@ -32,8 +32,11 @@ git commit -a -m 'testing patchset' function bugs_trivial { echo "bugs and trivial stuff" +#3.3-rc5 +git revert --no-edit a32744d4abae24572eff7269bc17895c41bd0085 + patch -s -p1 < "${DIR}/patches/trivial/0001-kbuild-deb-pkg-set-host-machine-after-dpkg-gencontro.patch" -patch -s -p1 < "${DIR}/patches/trivial/0001-kbuild-Fix-link-to-headers-in-make-deb-pkg.patch" +#patch -s -p1 < "${DIR}/patches/trivial/0001-kbuild-Fix-link-to-headers-in-make-deb-pkg.patch" } function cpufreq { diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig index 506f44bce28afe359aeb46f5abeab74e9f36379e..2ea368d47af684a359f603c9867321abf1b5fdd8 100644 --- a/patches/ref_omap2plus_defconfig +++ b/patches/ref_omap2plus_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.3.0-rc4 Kernel Configuration +# Linux/arm 3.3.0-rc5 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -408,7 +408,6 @@ CONFIG_CPU_USE_DOMAINS=y # # Processor Features # -# CONFIG_ARM_LPAE is not set # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARM_THUMB=y CONFIG_ARM_THUMBEE=y diff --git a/version.sh b/version.sh index 5d3c5ae1084f01b68a0814fba72d9f239c62607e..21630a21eeaa61d0426011f117634a46ab631662 100644 --- a/version.sh +++ b/version.sh @@ -9,9 +9,9 @@ KERNEL_REL=3.3 #for x.x-rcX RC_KERNEL=3.3 -RC_PATCH=-rc4 +RC_PATCH=-rc5 -ABI=1.2 +ABI=2 BUILD=d${ABI}