shr: cleanup distro config a bit

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index f345a22..2cd567a 100644 (file)
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -4,17 +4,13 @@
 #@DESCRIPTION: Linux Distribution Configuration for Mobile Phones
 #-----------------------------------------------------------------------------
 
-# set default locale for images - we have to do that before
-# including angstrom-2007-for-openmoko.inc because otherwise
-# it will be already set to en-gb
+# set default locale for images
 IMAGE_LINGUAS ?= "en-us"
 
 # Set the toolchain type (internal, external) and brand (generic, csl etc.)
 TOOLCHAIN_TYPE ?= "internal"
 TOOLCHAIN_BRAND ?= ""
 
-#LIBC = "glibc"
-
 BB_LOCALCOUNT_OVERRIDE = ""
 require conf/distro/include/preferred-shr-versions.inc
 require conf/distro/include/shr-autorev.inc
@@ -27,7 +23,6 @@ DISTRO_VERSION = "-${DATE}"
 DISTRO_REVISION = "2"
 DISTRO_PR = ".5"
 DISTRO_TYPE = "release"
-#DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
 DISTRO_SSH_DAEMON = "openssh"
@@ -77,16 +72,6 @@ IMAGE_INITSCRIPTS = "initscripts-shr"
 
 IPKG_VARIANT = "opkg"
 
-# Same kernel so same usb
-PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t"
-PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t"
-# same kernel so same keymaps
-PACKAGE_ARCH_pn-keymaps_om-gta01 = "armv4t"
-PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
-# neod knows about both machines
-PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
-PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
-
 #Illume settings
 ILLUME_CONFIG = "e-wm-config-illume-shr"
 ILLUME_THEME = "e-wm-theme-illume-gry"
@@ -184,9 +169,6 @@ require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
 require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-opie-versions-1.2.4.inc
-#Use newest available (X11R7.5 now)
-#require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
-#require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
 
 #############################################################################
 # CONTENTS