repair broken package build, ensure s57static for tools

build.gradle

@@ -57,7 +57,9 @@ def DEFAULT_DEPS = [
                 ['libstdc++6'],
                 ['libssl1.1'],
                 ['libcurl4'],
-                [primary:['python3-mapbox-earcut'], or:['base-files']]
+                [primary:['python3-mapbox-earcut'], or:['base-files']],
+                ['gdal-bin'],
+                ['libusb-0.1-4']
         ]
 def IMAGE_VERSION = "A1"        
 def VARIANTS=[
@@ -93,14 +95,6 @@ def VARIANTS=[
          oexdir: 'linux64',
          dependencies: DEFAULT_DEPS
         ],
-        [osline:'debian',
-         osversion:'buster',
-         arch: 'i386',
-         tag: IMAGE_VERSION,
-         dockerbase:'i386/debian',
-         dockerfile:'Dockerfile.all',
-         dependencies: DEFAULT_DEPS
-         ],
         [osline:'debian',
          osversion:'buster',
          arch: 'amd64',
@@ -364,9 +358,13 @@ ospackage {
             include "collectS57.sh"
             fileMode 0755
         }
-        from('tools/senc')
+        from('tools/senc'){
             include "*.py"
-            into "senc"        
+            into "senc"    
+        } 
+        from('tools/senc/s57static'){
+            into "senc/s57static"    
+        }    
     }
     into("/etc/udev/rules.d"){
         from(projectDir){

tools/senc/s57static

@@ -0,0 +1 @@
+../../provider/s57static

tools/senc/sqlite2senc.py

@@ -275,7 +275,7 @@ def a2l(lastAttrs):
 class Options:
     def __init__(self):
         self.basedir=None
-        self.s57dir=os.path.join(os.path.dirname(__file__),"..","..","provider","s57static")
+        self.s57dir=os.path.join(os.path.dirname(__file__),"s57static")
         self.em=senc.SencFile.EM_ALL
         self.scale=None
         self.ignoreErrors=False

tools/tosenc.py

@@ -149,7 +149,7 @@ def handleSingleFile(context:Context,ifile:str,ofile:str):
 M_FILES=0
 M_DIR=1
 if __name__ == '__main__':
-    s57dir=os.path.join(os.path.dirname(__file__),"..","provider","s57static")
+    s57dir=os.path.join(os.path.dirname(__file__),"senc","s57static")
     basedir=None
     scale=None
     optlist,args=getopt.getopt(sys.argv[1:],"b:d:s:e:ic:")