Update REPO directories to match standard APT names binary-arch

builds/any/rootfs/jessie/standard/standard.yml

@@ -43,11 +43,11 @@ Multistrap:
     omitdebsrc: true
 
   Local-All:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/all
+    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-all
     omitdebsrc: true
 
   Local-Arch:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/${ARCH}
+    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-${ARCH}
     omitdebsrc: true
 
 Configure:

builds/any/rootfs/wheezy/standard/standard.yml

@@ -43,11 +43,11 @@ Multistrap:
     omitdebsrc: true
 
   Local-All:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/all
+    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-all
     omitdebsrc: true
 
   Local-Arch:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/${ARCH}
+    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-${ARCH}
     omitdebsrc: true
 
 Configure:

tools/onlpm.py

@@ -605,8 +605,8 @@ class OnlPackageRepo(object):
                 package = os.path.split(underscores[0])[1]
                 # Architecture is the last entry (.deb)
                 arch = underscores[-1].split('.')[0]
-                logger.debug("+ /bin/cp %s %s/%s", p, self.repo, arch)
-                dstdir = os.path.join(self.repo, arch)
+                logger.debug("+ /bin/cp %s %s/%s", p, self.repo, "binary-" + arch)
+                dstdir = os.path.join(self.repo, "binary-" + arch)
                 if not os.path.exists(dstdir):
                     os.makedirs(dstdir)
                 logger.info("dstdir=%s"% dstdir)
@@ -637,7 +637,7 @@ class OnlPackageRepo(object):
         with self.lock:
             rv = []
             (name, arch) = OnlPackage.idparse(pkg)
-            dirname = os.path.join(self.repo, arch)
+            dirname = os.path.join(self.repo, "binary-" + arch)
             if os.path.exists(dirname):
                 manifest = os.listdir(dirname)
                 rv = [ os.path.join(dirname, x) for x in manifest if arch in x and "%s_" % name in x ]