Update ci.yml

.github/workflows/ci.yml

@@ -7,13 +7,13 @@ env:
   IMAGE_NAME: pika-base-debian-container
 
 jobs:
-  # Push image to GitHub Packages.
+  build:
-  # See also https://docs.docker.com/docker-hub/builds/
+    runs-on: self-hosted
-  push:
+    container:
-    runs-on: ubuntu-latest
+      image: ubuntu:latest
-    permissions:
+      volumes:
-      packages: write
+        - /proc:/proc
-      contents: read
+      options: --privileged -it
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/gen-i386-whitelist.yml

@@ -0,0 +1,25 @@
+name: Generate and commit i386 whitelist
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pika-base-debian-container:i386
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Get script depends
+      run: apt-get install -y python3-numpy
+
+    - name: Generate whitelist json files
+      run: ./gen-i386-whitelist.py
+
+    - name: Setup git and push
+      run: git config --global user.name 'Github Workflow Action' && git config --global user.email 'hotrod.master@hotmail.com' && git config --global --add safe.directory /__w/pika-base-debian-container/pika-base-debian-container && git add . && git commit -am"Commited by GH Action - gen-i386-whitelist.yml" && git push

Dockerfile

@@ -9,5 +9,7 @@ RUN ./setup.sh
 RUN apt update
 RUN apt full-upgrade -y
 RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
-RUN wget https://ppa.pika-os.com/pool/main/p/pika-pbuilder/pika-pbuilder_0.2.34-101pika1_all.deb -O ./pika-pbuilder.deb
+RUN wget https://ppa.pika-os.com/pool/cockatiel/p/pika-pbuilder/pika-pbuilder_0.2.37-101pika1_all.deb -O ./pika-pbuilder.deb
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata software-properties-common sudo devscripts git eatmydata bc cowbuilder gpg gpg-agent bison build-essential ccache cmake cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar aptly devscripts dh-make rpm2cpio ./pika-pbuilder.deb -o Dpkg::Options::="--force-confnew"
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata software-properties-common sudo nodejs npm devscripts git eatmydata bc cowbuilder gpg gpg-agent bison build-essential ccache cmake cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar aptly devscripts dh-make rpm2cpio ./pika-pbuilder.deb -o Dpkg::Options::="--force-confnew"
+# Debian missing Build workaround
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libdrm-dev gir1.2-gudev-1.0 libgudev-1.0-0 libgudev-1.0-dev libgbm-dev libgbm1 libsystemd-dev systemd-dev libgps-dev kirigami-addons-dev kirigami2-dev libkirigami-dev qttools5-dev libqt5core5t64 -o Dpkg::Options::="--force-confnew"

debootstrap.sh

@@ -0,0 +1,11 @@
+#! /bin/bash
+set -e
+DIST=sid ARCH=amd64 debootstrap --arch=amd64 sid base_chroot || true
+rm -rf base_chroot/debootstrap
+chroot ./base_chroot /bin/bash -c "apt-get update -y"
+chroot ./base_chroot /bin/bash -c "apt-get install -y wget"
+chroot ./base_chroot /bin/bash -c "wget https://ppa.pika-os.com/pool/cockatiel/p/pika-pbuilder/pika-pbuilder_0.2.37-101pika1_all.deb -O ./pika-pbuilder.deb"
+chroot ./base_chroot /bin/bash -c "apt-get install -y ./pika-pbuilder.deb "
+chroot ./base_chroot /bin/bash -c "pika-pbuilder-amd64-v3-lto-init"
+cd  ./base_chroot
+tar -czvf ../base_chroot.tgz ./*

exp_src_names.json

@@ -276,6 +276,7 @@
         "kipi-plugins",
         "kirigami2",
         "kirigami-addons",
+        "kirigami-addons5",
         "kirigami-gallery",
         "kiriki",
         "kitemmodels",
@@ -351,6 +352,7 @@
         "kquickimageeditor",
         "kraft",
         "krdc",
+        "krdp",
         "krename",
         "kreport",
         "kreversi",
@@ -435,6 +437,7 @@
         "libdbusmenu-qt",
         "libkcddb",
         "libkcompactdisc",
+        "libkdcraw",
         "libkdegames",
         "libkdepim",
         "libkeduvocdocument",
@@ -537,6 +540,7 @@
         "pulseaudio-qt",
         "purpose",
         "pyside2",
+        "pyside6",
         "qbs",
         "qca2",
         "qconf",
@@ -544,89 +548,6 @@
         "qgnomeplatform",
         "qqc2-breeze-style",
         "qqc2-desktop-style",
-        "qt3d-opensource-src",
-        "qt5ct",
-        "qt5reactor",
-        "qt6-3d",
-        "qt6-5compat",
-        "qt6-base",
-        "qt6-charts",
-        "qt6-connectivity",
-        "qt6-datavis3d",
-        "qt6-declarative",
-        "qt6-grpc",
-        "qt6-httpserver",
-        "qt6-imageformats",
-        "qt6-languageserver",
-        "qt6-location",
-        "qt6-lottie",
-        "qt6-multimedia",
-        "qt6-networkauth",
-        "qt6-positioning",
-        "qt6-quick3d",
-        "qt6-quick3dphysics",
-        "qt6-quicktimeline",
-        "qt6-remoteobjects",
-        "qt6-scxml",
-        "qt6-sensors",
-        "qt6-serialbus",
-        "qt6-serialport",
-        "qt6-shadertools",
-        "qt6-speech",
-        "qt6-svg",
-        "qt6-tools",
-        "qt6-translations",
-        "qt6-virtualkeyboard",
-        "qt6-wayland",
-        "qt6-webchannel",
-        "qt6-webengine",
-        "qt6-websockets",
-        "qt6-webview",
-        "qtbase-opensource-src",
-        "qtbase-opensource-src-gles",
-        "qtcharts-opensource-src",
-        "qtchooser",
-        "qtconnectivity-opensource-src",
-        "qtcreator",
-        "qtcurve",
-        "qtdatavis3d-everywhere-src",
-        "qtdeclarative-opensource-src",
-        "qtdeclarative-opensource-src-gles",
-        "qtdoc-opensource-src",
-        "qtfeedback-opensource-src",
-        "qtgamepad-everywhere-src",
-        "qtgraphicaleffects-opensource-src",
-        "qt-gstreamer",
-        "qtimageformats-opensource-src",
-        "qtkeychain",
-        "qtlocation-opensource-src",
-        "qtmultimedia-opensource-src",
-        "qtnetworkauth-everywhere-src",
-        "qtpim-opensource-src",
-        "qtquickcontrols2-opensource-src",
-        "qtquickcontrols-opensource-src",
-        "qtremoteobjects-everywhere-src",
-        "qtscript-opensource-src",
-        "qtscxml-everywhere-src",
-        "qtsensors-opensource-src",
-        "qtserialbus-everywhere-src",
-        "qtserialport-opensource-src",
-        "qtspeech-opensource-src",
-        "qtspell",
-        "qtstyleplugins-src",
-        "qtsvg-opensource-src",
-        "qtsystems-opensource-src",
-        "qttools-opensource-src",
-        "qttranslations-opensource-src",
-        "qtvirtualkeyboard-opensource-src",
-        "qtwayland-opensource-src",
-        "qtwebchannel-opensource-src",
-        "qtwebengine-opensource-src",
-        "qtwebkit-opensource-src",
-        "qtwebsockets-opensource-src",
-        "qtwebview-opensource-src",
-        "qtx11extras-opensource-src",
-        "qtxmlpatterns-opensource-src",
         "quassel",
         "qzxing",
         "readstat",
@@ -662,7 +583,6 @@
         "tokodon",
         "umbrello",
         "verdigris",
-        "wacomtablet",
         "xdg-desktop-portal-kde",
         "yakuake",
         "zanshin",

gen-apt-config.py

@@ -4,7 +4,12 @@ import os, errno
 import json
 import subprocess
 
-_APT_CONFIG_PIN="""Package:{PACKAGES}
+_APT_CONFIG_PIN="""
+Package: *
+Pin: release a=experimental   
+Pin-Priority: 390
+
+Package:{PACKAGES}
 Pin: release a=experimental   
 Pin-Priority: 600
 """
@@ -25,7 +30,7 @@ for file in srcnames_files:
     for line in file.readlines():
         srcname = line.strip()
         srcname_lines.append(srcname)
-        result = subprocess.run([current_path + "/apt_experiments", '-n', srcname], stdout=subprocess.PIPE)
+        result = subprocess.run([current_path + '/get-bin-name-from-src.sh', srcname], stdout=subprocess.PIPE)
         stdout = result.stdout.decode('utf-8')
         for line in stdout.splitlines():
             if line != "":
@@ -49,8 +54,8 @@ pkg_data = {
 
 apt_pin_packages = ""
 
-for pkg in pkgname_lines:
+for pkg in srcname_lines:
-    apt_pin_packages += (" " + pkg)
+    apt_pin_packages += (" src:" + pkg)
 
 silentremove("0-debian-exp-overrides")
 with open("0-debian-exp-overrides", "w") as file:

gen-apt-config.sh

@@ -1,4 +1,6 @@
 #! /bin/bash
 echo -e "Package: *\nPin: release a=experimental\nPin-Priority: 600" > /etc/apt/preferences.d/0-pika-debian-settings
+chmod +x ./get-bin-name-from-src.sh
+chmod +x ./gen-apt-config.py
 apt-get update -y
 ./gen-apt-config.py

gen-i386-whitelist.py

@@ -0,0 +1,78 @@
+#! /bin/python3
+
+import os, errno
+import json
+import subprocess
+import apt
+import numpy as np
+import threading
+
+def silentremove(filename):
+    try:
+        os.remove(filename)
+    except OSError as e: # this would be "except OSError, e:" before Python 2.6
+        if e.errno != errno.ENOENT: # errno.ENOENT = no such file or directory
+            raise # re-raise exception if a different error occurred    
+
+def pharse_build_tree(pkg_arr, current_path, pkgname_lines):
+    for pkgname in pkg_arr:
+        print("Parsing dep tree for: " + pkgname)
+        result = subprocess.run([current_path + '/get_depend_tree.sh', pkgname], stdout=subprocess.PIPE)
+        stdout = result.stdout.decode('utf-8')
+        for line in stdout.splitlines():
+                if line != "":
+                    pkgname_lines.append(line)
+
+current_path = os.path.dirname(os.path.realpath(__file__))
+
+global whitelist_arr
+whitelist_arr = np.array([])
+thread_arr = []
+pkgname_lines = []
+srcname_lines = []
+srcnames_clean = []
+file = open(current_path + "/i386_whitelist_bins", "r")
+
+for line in file.readlines():
+    pkgname = line.strip()
+    if pkgname != "" and not pkgname.endswith("-udeb"):
+        pkgname_lines.append(pkgname)
+        whitelist_arr = np.append(whitelist_arr, [pkgname])
+file.close()
+
+newarr = np.array_split(whitelist_arr, 20)
+
+for array in newarr:
+    t0 = threading.Thread(target=pharse_build_tree, args=(array, current_path, pkgname_lines,))
+    thread_arr.append(t0)
+    
+for thread_proc in thread_arr:
+    thread_proc.start()
+
+for thread_proc in thread_arr:
+    thread_proc.join()  
+
+c = apt.Cache()
+
+for pkgname in pkgname_lines:
+    try:
+        src_name = c[pkgname].candidate.source_name
+        if src_name:
+            srcname_lines.append(src_name)
+    except:
+        pass
+
+for i in srcname_lines:
+  if i not in srcnames_clean and i + "-dmo" not in srcnames_clean:
+    srcnames_clean.append(i)
+
+src_data = {
+    'i386_whitelist': [source_name for source_name in srcnames_clean],
+}
+
+
+silentremove("i386_src_whitelist.json")
+with open("i386_src_whitelist.json", "w") as twitterDataFile:
+    twitterDataFile.write(
+        json.dumps(src_data, indent=4)
+    )

generate-srcnames-from-debian-qa

@@ -0,0 +1,2 @@
+#! /bin/bash
+cat "$1" | cut -f1 -d " " | cut -f1 -d"*" | sort -u

get-bin-name-from-src.sh

@@ -0,0 +1,2 @@
+#! /bin/bash
+apt showsrc "$1" | grep -E "^Binary:" | cut -d":" -f2- | sed 's/\,/\n/g' | sed 's/\ /\n/g' | sed '/^$/d'

get_depend_tree.py

@@ -0,0 +1,41 @@
+#!/usr/bin/python3
+import sys
+
+import apt
+
+
+def dependencies(cache, pkg, deps, key="Depends"):
+    # print "pkg: %s (%s)" % (pkg.name, deps)
+    candver = cache._depcache.get_candidate_ver(pkg._pkg)
+    if candver is None:
+        return deps
+    dependslist = candver.depends_list
+    if key in dependslist:
+        for depVerList in dependslist[key]:
+            for dep in depVerList:
+                if dep.target_pkg.name in cache:
+                    if (
+                        pkg.name != dep.target_pkg.name
+                        and dep.target_pkg.name not in deps
+                    ):
+                        deps.add(dep.target_pkg.name)
+                        dependencies(cache, cache[dep.target_pkg.name], deps, key)
+    return deps
+
+
+pkgname = sys.argv[1]
+c = apt.Cache()
+
+try:
+    pkg = c[pkgname]
+
+    deps = set()
+
+    deps = dependencies(c, pkg, deps, "Depends")
+    print(" ".join(deps))
+
+    preDeps = set()
+    preDeps = dependencies(c, pkg, preDeps, "PreDepends")
+    print(" ".join(preDeps))
+except:
+    pass

get_depend_tree.sh

@@ -0,0 +1,2 @@
+#! /bin/bash
+./get_depend_tree.py "$1" | sed 's/\,/\n/g' | sed 's/\ /\n/g' | sed '/^$/d'

get_source_name.py

@@ -0,0 +1,9 @@
+#!/usr/bin/python3
+import sys
+
+import apt
+
+pkgname = sys.argv[1]
+c = apt.Cache()
+print(c[pkgname].candidate.source_name)
+

package_pkgnames_overrides

@@ -23,3 +23,8 @@ libweather-ion7
 plasma-workspace
 plasma-workspace-data
 plasma-workspace-dev
+libksysguard-bin
+libc6-amd64
+libc6-dev-amd64
+libc6-dev-x32
+libc6-x32

package_srcnames/kde-srcnames.txt

@@ -274,6 +274,7 @@ kio-gopher
 kipi-plugins
 kirigami2
 kirigami-addons
+kirigami-addons5
 kirigami-gallery
 kiriki
 kitemmodels
@@ -349,6 +350,7 @@ kquickcharts
 kquickimageeditor
 kraft
 krdc
+krdp
 krename
 kreport
 kreversi
@@ -433,6 +435,7 @@ libappimage
 libdbusmenu-qt
 libkcddb
 libkcompactdisc
+libkdcraw
 libkdegames
 libkdepim
 libkeduvocdocument
@@ -535,6 +538,7 @@ projecteur
 pulseaudio-qt
 purpose
 pyside2
+pyside6
 qbs
 qca2
 qconf
@@ -542,89 +546,6 @@ qcoro
 qgnomeplatform
 qqc2-breeze-style
 qqc2-desktop-style
-qt3d-opensource-src
-qt5ct
-qt5reactor
-qt6-3d
-qt6-5compat
-qt6-base
-qt6-charts
-qt6-connectivity
-qt6-datavis3d
-qt6-declarative
-qt6-grpc
-qt6-httpserver
-qt6-imageformats
-qt6-languageserver
-qt6-location
-qt6-lottie
-qt6-multimedia
-qt6-networkauth
-qt6-positioning
-qt6-quick3d
-qt6-quick3dphysics
-qt6-quicktimeline
-qt6-remoteobjects
-qt6-scxml
-qt6-sensors
-qt6-serialbus
-qt6-serialport
-qt6-shadertools
-qt6-speech
-qt6-svg
-qt6-tools
-qt6-translations
-qt6-virtualkeyboard
-qt6-wayland
-qt6-webchannel
-qt6-webengine
-qt6-websockets
-qt6-webview
-qtbase-opensource-src
-qtbase-opensource-src-gles
-qtcharts-opensource-src
-qtchooser
-qtconnectivity-opensource-src
-qtcreator
-qtcurve
-qtdatavis3d-everywhere-src
-qtdeclarative-opensource-src
-qtdeclarative-opensource-src-gles
-qtdoc-opensource-src
-qtfeedback-opensource-src
-qtgamepad-everywhere-src
-qtgraphicaleffects-opensource-src
-qt-gstreamer
-qtimageformats-opensource-src
-qtkeychain
-qtlocation-opensource-src
-qtmultimedia-opensource-src
-qtnetworkauth-everywhere-src
-qtpim-opensource-src
-qtquickcontrols2-opensource-src
-qtquickcontrols-opensource-src
-qtremoteobjects-everywhere-src
-qtscript-opensource-src
-qtscxml-everywhere-src
-qtsensors-opensource-src
-qtserialbus-everywhere-src
-qtserialport-opensource-src
-qtspeech-opensource-src
-qtspell
-qtstyleplugins-src
-qtsvg-opensource-src
-qtsystems-opensource-src
-qttools-opensource-src
-qttranslations-opensource-src
-qtvirtualkeyboard-opensource-src
-qtwayland-opensource-src
-qtwebchannel-opensource-src
-qtwebengine-opensource-src
-qtwebkit-opensource-src
-qtwebsockets-opensource-src
-qtwebview-opensource-src
-qtx11extras-opensource-src
-qtxmlpatterns-opensource-src
 quassel
 qzxing
 readstat
@@ -660,7 +581,6 @@ threadweaver
 tokodon
 umbrello
 verdigris
-wacomtablet
 xdg-desktop-portal-kde
 yakuake
 zanshin

setup.sh

@@ -64,16 +64,12 @@ Package: *
 Pin: release o=Unofficial Multimedia Packages
 Pin-Priority: 550
 
-Package: pika-abi-bridge*
-Pin: release a=pika,c=canary
-Pin-Priority: 600
-
 # Give pika lowest priority because we don't want it sources overwriting
 Package: *
 Pin: release a=pika,c=canary
-Pin-Priority: 390
+Pin-Priority: 380
 
-Package: pika-abi-bridge*
+Package: pika-abi-bridge* *exiv2* akonadi-mime-data libkf5akonadimime-dev libkf5akonadimime5
 Pin: release a=pika,c=canary
 Pin-Priority: 600
 EOF