[oe-commits] org.oe.dev linux-gta01: disable kernel logo completely (for now)

[mickeyl commit]

linux-gta01: disable kernel logo completely (for now)

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 4d6245acf60fea829a596473c6fd7d772df159b9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4d6245acf60fea829a596473c6fd7d772df159b9
Files:
1
packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01
packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
packages/linux/linux-gta01.inc
packages/linux/linux-gta01_2.6.21.5.bb
Diffs:

#
# mt diff -r02101e9fd782a917779dd3556ef18b12c93f758e -r4d6245acf60fea829a596473c6fd7d772df159b9
#
# 
# 
# patch "packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01"
#  from [d37b0d7a88ff3c521069869b88eb1d365aceeffb]
#    to [a4fce0d73552488787ac6ff3486cdf1c84546f65]
# 
# patch "packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01"
#  from [b13800e54f61edf724b8c70fbf5b508ea11f79e9]
#    to [e33e541e6f793d94d9fa783562429ff4ac0e7189]
# 
# patch "packages/linux/linux-gta01.inc"
#  from [7538e9a0489178797d787503f993d57517becf9c]
#    to [44323377f4017d36e02429fa4c056b0b73c70cdd]
# 
# patch "packages/linux/linux-gta01_2.6.21.5.bb"
#  from [e6db6ff2a3c5110427abc294b19a748b07070848]
#    to [42a58603d3240f81b7d74124c8ec6cdaa5255b22]
# 
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01	d37b0d7a88ff3c521069869b88eb1d365aceeffb
+++ packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01	a4fce0d73552488787ac6ff3486cdf1c84546f65
@@ -1205,10 +1205,10 @@ CONFIG_FONT_6x11=y
 #
 # Logo configuration
 #
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
 
 #
 # Sound
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01	b13800e54f61edf724b8c70fbf5b508ea11f79e9
+++ packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01	e33e541e6f793d94d9fa783562429ff4ac0e7189
@@ -1205,10 +1205,10 @@ CONFIG_FONT_6x11=y
 #
 # Logo configuration
 #
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
 
 #
 # Sound
============================================================
--- packages/linux/linux-gta01.inc	7538e9a0489178797d787503f993d57517becf9c
+++ packages/linux/linux-gta01.inc	44323377f4017d36e02429fa4c056b0b73c70cdd
@@ -13,7 +13,8 @@ SRC_URI = "http://ftp.de.kernel.org/pub/
 # source and patches
 #
 SRC_URI = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
-           file://defconfig-${VANILLA_VERSION}-${MACHINE}"
+           file://defconfig-${VANILLA_VERSION}-${MACHINE} \
+           file://logo_linux_clut224.ppm"
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"
 
 ##############################################################
@@ -49,12 +50,13 @@ do_prepatch() {
 module_autoload_s3cmci = "s3cmci"
 
 do_prepatch() {
-        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
-        rm -Rf patches .pc
+	mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+	mv patches patches.old
+	mv .pc .pc.old
 }
 
 do_configure() {
-	#install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+	install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
 
 	if [ ! -e ${WORKDIR}/defconfig-${VANILLA_VERSION}-${MACHINE} ]; then
 		die "No default configuration for ${MACHINE} available."
============================================================
--- packages/linux/linux-gta01_2.6.21.5.bb	e6db6ff2a3c5110427abc294b19a748b07070848
+++ packages/linux/linux-gta01_2.6.21.5.bb	42a58603d3240f81b7d74124c8ec6cdaa5255b22
@@ -1,10 +1,10 @@ MOKOR = "moko10"
 require linux-gta01.inc
 
 SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
 SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1"
 
 MOKOR = "moko10"
-PR = "r2"
+PR = "r3"
 
 VANILLA_VERSION = "2.6.21.5"