[oe-commits] org.oe.dev merge of '1146b968b17a4186232fbe41a3a6eb7fe30cc300'

[hrw commit]

merge of '1146b968b17a4186232fbe41a3a6eb7fe30cc300'
     and '40ef55d01967050e97ee3727a1e5e15b968e0a92'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 5bc88c35c6a1a9506332f5b6f0f633c5b81ae4cd
ViewMTN: http://monotone.openembedded.org/revision/info/5bc88c35c6a1a9506332f5b6f0f633c5b81ae4cd
Files:
1
contrib/source-checker/oe-source-checker.py
conf/machine/em-x270.conf
Diffs:

#
# mt diff -r1146b968b17a4186232fbe41a3a6eb7fe30cc300 -r5bc88c35c6a1a9506332f5b6f0f633c5b81ae4cd
#
# 
# 
# patch "contrib/source-checker/oe-source-checker.py"
#  from [37613cedfdaa0e228f5184c747b61c7cf364ebfe]
#    to [5aabcd40189547d5ce2405c8b3bc94bbf81dfb2c]
# 
============================================================
--- contrib/source-checker/oe-source-checker.py	37613cedfdaa0e228f5184c747b61c7cf364ebfe
+++ contrib/source-checker/oe-source-checker.py	5aabcd40189547d5ce2405c8b3bc94bbf81dfb2c
@@ -36,37 +36,46 @@
 #
 
 
-import sys, ConfigParser
+import sys
 
+if len(sys.argv) < 3:
+    print """
+    OpenEmbedded source checker script require two arguments:
+
+    1. location of conf/checksums.ini
+    2. path to DL_DIR (without "/" at the end)
+    """
+    sys.exit(0)
+
+import ConfigParser, os
+
 checksums_parser = ConfigParser.ConfigParser()
 checksums_parser.read(sys.argv[1])
 
 for source in checksums_parser.sections():
     archive = source.split("/")[-1]
-    localpath = sys.argv[2] + "/" + archive
+    localpath = os.path.join(sys.argv[2], archive)
     md5 = checksums_parser.get(source, "md5")
     sha = checksums_parser.get(source, "sha256")
 
     try:
         os.stat(localpath)
-        try:
-            md5pipe = os.popen('md5sum ' + localpath)
-            md5data = (md5pipe.readline().split() or [ "" ])[0]
-            md5pipe.close()
-        except OSError:
-            raise Exception("Executing md5sum failed")
+    except:
+        continue
 
-        try:
-            shapipe = os.popen("oe_sha256sum " + localpath)
-            shadata = (shapipe.readline().split() or [ "" ])[0]
-            shapipe.close()
-        except OSError:
-            raise Exception("Executing shasum failed")
+    try:
+        md5pipe = os.popen('md5sum ' + localpath)
+        md5data = (md5pipe.readline().split() or [ "" ])[0]
+        md5pipe.close()
 
         if md5 != md5data:
             print "%s has wrong md5: %s instead of %s url: %s" % (archive, md5data, md5, source) 
 
-        if sha != shadata:
+        shapipe = os.popen("oe_sha256sum " + localpath)
+        shadata = (shapipe.readline().split() or [ "" ])[0]
+        shapipe.close()
+
+        if shadata != "" and sha != shadata:
             print "%s has wrong sha: %s instead of %s url: %s" % (archive, shadata, sha, source) 
     except:
         pass


#
# mt diff -r40ef55d01967050e97ee3727a1e5e15b968e0a92 -r5bc88c35c6a1a9506332f5b6f0f633c5b81ae4cd
#
# 
# 
# patch "conf/machine/em-x270.conf"
#  from [2068d979d6158266b6c75fe1b8ff553e77308e04]
#    to [5345e7b2b7ee8722993816968ec1019cd30e3669]
# 
============================================================
--- conf/machine/em-x270.conf	2068d979d6158266b6c75fe1b8ff553e77308e04
+++ conf/machine/em-x270.conf	5345e7b2b7ee8722993816968ec1019cd30e3669
@@ -12,12 +12,13 @@ PREFERRED_PROVIDER_virtual/kernel = "${M
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-#require conf/machine/include/tune-xscale.conf
+#require conf/machine/include/tune-xscale.inc
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-# require conf/machine/include/tune-iwmmxt.conf
-require conf/machine/include/tune-xscale.conf
+# require conf/machine/include/tune-iwmmxt.inc
 
+require conf/machine/include/tune-xscale.inc
+
 ROOT_FLASH_SIZE = "128"
 IMAGE_CMD_jffs2 = " \
 /usr/sbin/mkfs.jffs2 --root=${IMAGE_ROOTFS} \