git » autoupdaters.git » commit 961d589

Automatic update

author Urja (ARMLFS builder)
2024-07-24 08:36:09 UTC
committer Urja (ARMLFS builder)
2024-07-24 08:36:09 UTC
parent d52b3ea1d6ad4ff90b3eed682b9804348c9ae085

Automatic update

linux-kbb/bisect-tools/build.sh +5 -4
linux-kbb/kbb.py +19 -15

diff --git a/linux-kbb/bisect-tools/build.sh b/linux-kbb/bisect-tools/build.sh
index fa19537..f248250 100755
--- a/linux-kbb/bisect-tools/build.sh
+++ b/linux-kbb/bisect-tools/build.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 set -e
 set -x
-git cherry-pick -n 480b54e36c6
-git cherry-pick -n ab969bff88e
-make olddefconfig
+#git reset --hard
+#git cherry-pick -n 480b54e36c6
+#git cherry-pick -n ab969bff88e
+#make olddefconfig
 make -j3 zImage modules dtbs
 rm -rf inst
 mkdir -p inst/{boot,usr/lib/modules}
@@ -13,4 +14,4 @@ cp arch/arm/boot/zImage "inst/boot/zImage-test"
 cd inst
 tar czf test.tar.gz boot usr
 cd ..
-
+ssh veyron ./rkup.sh
diff --git a/linux-kbb/kbb.py b/linux-kbb/kbb.py
index 52aa864..d72d488 100755
--- a/linux-kbb/kbb.py
+++ b/linux-kbb/kbb.py
@@ -45,6 +45,7 @@ class KB:
         self.dir = dir
         if build is None:
             build = f"./build-{patchset}-{verpolicy}.sh"
+        self.build = build
         self.indir = False
         self.mounted = False
 
@@ -74,7 +75,7 @@ class KB:
         try:
             _ = os.stat(self.dir + "/Makefile")
         except FileNotFoundError:
-            mkworktree()
+            self.mkworktree()
         os.chdir(self.dir)
         self.indir = True
 
@@ -85,8 +86,9 @@ class KB:
 
 
 kernels = [
-    KB("armlfs")
-    KB("armlfs", "6.6")
+    KB("armlfs"),
+    KB("armlfs", "6.6"),
+    KB("armlfs", "6.1")
 ]
 
 url = "https://www.kernel.org/releases.json"
@@ -301,18 +303,20 @@ def build(k, nv, tag):
     logfn = f"log/build-{k}-{ymd}-v{nv}_{pids}.log"
     print(f"Building - for details see '{logfn}'")
     with open(logfn, "w") as f:
-        if sub([k.build, tag], stdin=DEVNULL, stderr=STDOUT, stdout=f):
-            print("Done. Return value zero (y).")
-            print("Running publish()..")
-            publish(k, nv, tag)
-            print("Done")
-            return f"{k} {nv}"
-        else:
-            print("Oopsie? Build ended with nonzero return value :(")
-            mail(f"Build failure {k} {nv}", logfn)
-            with open("ATTN.txt", "a") as of:
-                of.write(logfn + "\n")
-            return None
+        with subprocess.Popen(["yes", ""], stdin=DEVNULL, stdout=PIPE) as yep:
+            if sub([k.build, tag], stdin=yep.stdout, stderr=STDOUT, stdout=f):
+                print("Done. Return value zero (y).")
+                print("Running publish()..")
+                publish(k, nv, tag)
+                print("Done")
+                return f"{k} {nv}"
+            else:
+                print("Oopsie? Build ended with nonzero return value :(")
+                mail(f"Build failure {k} {nv}", logfn)
+                with open("ATTN.txt", "a") as of:
+                    of.write(logfn + "\n")
+                return None
+        
 
 
 def doakernel(k, rels, update_mainline, update_stable):