[oe-commits] org.oe.dev merge of '0c9b3ba257c6fd0be25cd50f333f964013afe663'

[mickeyl commit]

merge of '0c9b3ba257c6fd0be25cd50f333f964013afe663'
     and '1b09c4fe8e1d1811f3dcd78988db7c3b3e182954'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 318bf9de24749da4afb57a01bd561de729d0d3c2
ViewMTN: http://monotone.openembedded.org/revision/info/318bf9de24749da4afb57a01bd561de729d0d3c2
Files:
1
packages/python/python-2.5.1/sitecustomize.py
packages/python/python_2.5.1.bb
packages/images/initramfs-bootmenu-image.bb
packages/images/initramfs-image.bb
packages/images/initramfs-minimal-image.bb
Diffs:

#
# mt diff -r0c9b3ba257c6fd0be25cd50f333f964013afe663 -r318bf9de24749da4afb57a01bd561de729d0d3c2
#
# 
# 
# patch "packages/python/python-2.5.1/sitecustomize.py"
#  from [af970496467ab4f0fbef36bbcac4de27afc77306]
#    to [37922f91ecd1cbccb466f30c120aeabfd2a0ae05]
# 
# patch "packages/python/python_2.5.1.bb"
#  from [55634fe124616917620d9a3239b160c4abcfd772]
#    to [6d27b00bf376c2bb92ca2334ea83cc13b1d06aa0]
# 
============================================================
--- packages/python/python-2.5.1/sitecustomize.py	af970496467ab4f0fbef36bbcac4de27afc77306
+++ packages/python/python-2.5.1/sitecustomize.py	37922f91ecd1cbccb466f30c120aeabfd2a0ae05
@@ -7,11 +7,11 @@
 # * load command line history on startup
 # * save command line history on exit 
 
-HISTORY_FILENAME = "/tmp/python-history-file.txt"
+import os
 
 def __exithandler():
     try:
-        readline.write_history_file( HISTORY_FILENAME )
+        readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
     except IOError:
         pass
 
@@ -22,7 +22,7 @@ def __enableReadlineSupport():
 def __enableReadlineSupport():
     readline.parse_and_bind("tab: complete")
     try:
-        readline.read_history_file( "/tmp/python-history-file.txt" )
+        readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
     except IOError:
         pass
 
============================================================
--- packages/python/python_2.5.1.bb	55634fe124616917620d9a3239b160c4abcfd772
+++ packages/python/python_2.5.1.bb	6d27b00bf376c2bb92ca2334ea83cc13b1d06aa0
@@ -7,7 +7,7 @@ DEPENDS_sharprom = "python-native readli
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
 
 # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
-PR = "ml7"
+PR = "ml8"
 
 PYTHON_MAJMIN = "2.5"
 


#
# mt diff -r1b09c4fe8e1d1811f3dcd78988db7c3b3e182954 -r318bf9de24749da4afb57a01bd561de729d0d3c2
#
# 
# 
# patch "packages/images/initramfs-bootmenu-image.bb"
#  from [c4a6c99f3e90e1c33c4101d8d843f89b6ea05dc8]
#    to [2338c2a27bfad430d95e665a283ae145d7e0dfce]
# 
# patch "packages/images/initramfs-image.bb"
#  from [16330772de554a7ddfd102c78519476ac56c84bd]
#    to [0d884f4dd165ce4f703bdf6ab9d55cfe5f3c3884]
# 
# patch "packages/images/initramfs-minimal-image.bb"
#  from [dbd98cff25cbaf41dce93c25db637d21705ffa51]
#    to [dd0f0126b7a188c7a4441a21b0ce881cf4e342b5]
# 
============================================================
--- packages/images/initramfs-bootmenu-image.bb	c4a6c99f3e90e1c33c4101d8d843f89b6ea05dc8
+++ packages/images/initramfs-bootmenu-image.bb	2338c2a27bfad430d95e665a283ae145d7e0dfce
@@ -1,4 +1,5 @@
-# Sample initramfs image
+# initramfs image with interactive boot menu allowing to select rootfs location
+# from choices of block devices, loopback images and NFS.
 
 IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu initramfs-module-check-modules"
 IMAGE_LINGUAS = ""
============================================================
--- packages/images/initramfs-image.bb	16330772de554a7ddfd102c78519476ac56c84bd
+++ packages/images/initramfs-image.bb	0d884f4dd165ce4f703bdf6ab9d55cfe5f3c3884
@@ -1,4 +1,6 @@
-# Sample initramfs image
+# initramfs image allowing to boot from location as specified on kernel
+# command line, from teh choices of block device, loop back images (including
+# recursive) and NFS.
 
 IMAGE_INSTALL = "initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 IMAGE_LINGUAS = ""
============================================================
--- packages/images/initramfs-minimal-image.bb	dbd98cff25cbaf41dce93c25db637d21705ffa51
+++ packages/images/initramfs-minimal-image.bb	dd0f0126b7a188c7a4441a21b0ce881cf4e342b5
@@ -1,4 +1,4 @@
-# Sample initramfs image
+# Sample initramfs image, very minimal
 
 IMAGE_INSTALL = "initramfs-module-nfs busybox-static"