Merge pull request #153 from endlessm/sam/update-poc

Update to GNOME OS 48.5

Author: Kekun

elements/components/accountsservice.bst

@@ -1,4 +1,4 @@
-# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.3 core-deps/accountsservice.bst
+# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.5 core-deps/accountsservice.bst
 
 kind: meson
 description: |

elements/components/cups-base.bst

@@ -1,4 +1,4 @@
-# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.23 components/cups-base.bst
+# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/cups-base.bst
 
 kind: autotools
 description:
@@ -14,8 +14,10 @@ build-depends:
 - freedesktop-sdk.bst:components/systemd.bst
 
 variables:
+  license-files-extra: NOTICE
   # Makefiles not added to build-dir which makes it unusable
   build-dir: ''
+  make-install-args: DSTROOT="%{install-root}" install
   conf-local: >-
     --enable-debug
     --with-components=all
@@ -30,16 +32,14 @@ variables:
 
 config:
   install-commands:
-  - |
-    make -j1 DSTROOT="%{install-root}" install
+    (>):
+    - |
+      tmpfilesdir="$(pkg-config --variable tmpfilesdir systemd)"
+      install -Dm644 tmpfiles.conf "%{install-root}${tmpfilesdir}/cups.conf"
 
-  - |
-    tmpfilesdir="$(pkg-config --variable tmpfilesdir systemd)"
-    install -Dm644 tmpfiles.conf "%{install-root}${tmpfilesdir}/cups.conf"
-
-  - |
-    sysusersdir="$(pkg-config --variable sysusersdir systemd)"
-    install -Dm644 sysusers.conf "%{install-root}${sysusersdir}/cups.conf"
+    - |
+      sysusersdir="$(pkg-config --variable sysusersdir systemd)"
+      install -Dm644 sysusers.conf "%{install-root}${sysusersdir}/cups.conf"
 
 public:
   bst:
@@ -68,12 +68,6 @@ public:
 sources:
 - kind: git_repo
   url: github:OpenPrinting/cups.git
-  track: v*
-  exclude:
-  - "*a*"
-  - "*b*"
-  - "*rc*"
-  - "*op*"
   ref: v2.4.10-0-gf3e5cc069c25647619aba8e0aefaa1969d71447e
 - kind: local
   # Overridde: Modified to name the system group "sudo".

elements/components/dracut.bst

@@ -1,4 +1,4 @@
-# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.23 components/flatpak.bst
+# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/flatpak.bst
 
 kind: meson
 description: |
@@ -8,7 +8,6 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 - freedesktop-sdk.bst:components/bison.bst
 - freedesktop-sdk.bst:components/docbook-xsl.bst
-- freedesktop-sdk.bst:components/xmlto.bst
 - freedesktop-sdk.bst:components/gettext.bst
 - freedesktop-sdk.bst:components/gobject-introspection.bst
 - freedesktop-sdk.bst:components/libxslt.bst
@@ -45,11 +44,5 @@ variables:
     -Dtests=false
     -Dsystem_dbus_proxy=xdg-dbus-proxy
 
-sources:
-- kind: git_repo
-  url: github:flatpak/flatpak.git
-  track: 1.1[02468]*
-  ref: 1.16.1-0-gb676905d91aa3c4e524ca663784d4cf085c465d7
-# Override: Apply patches.
-- kind: patch
-  path: patches/flatpak/revert-extra-data-sandbox.patch
+(@):
+- elements/include/flatpak.yml

elements/components/flatpak.bst

@@ -1,4 +1,4 @@
-# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.22 components/linux-pam-base.bst
+# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/linux-pam-base.bst
 
 kind: meson
 description: |
@@ -88,6 +88,7 @@ variables:
     -Dnis=disabled
     -Dselinux=disabled
     -Ddocs=disabled
+    -Delogind=disabled
     -Dusergroups=true
 
 config:
@@ -127,4 +128,4 @@ sources:
 - kind: git_repo
   url: github:linux-pam/linux-pam.git
   track: v*
-  ref: v1.7.0-0-gea980d991196df67cdd56b3f65d210b73218d08a
+  ref: v1.7.1-0-g693c4f75b10b25e09f70fe0b22f41bdcf9a48968

elements/components/linux-pam-base.bst

@@ -1,4 +1,4 @@
-# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.22 components/linux-pam.bst
+# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/linux-pam.bst
 
 kind: manual
 description: |

elements/components/linux-pam.bst

@@ -1,4 +1,4 @@
-# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.22 components/linux.bst
+# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/linux.bst
 
 kind: make
 description: |
@@ -18,10 +18,10 @@ depends:
 
 build-depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
-- freedesktop-sdk.bst:components/bc.bst
 - freedesktop-sdk.bst:components/bison.bst
 - freedesktop-sdk.bst:components/cpio.bst  # loongarch64 build enabled CONFIG_IKHEADERS by default
 - freedesktop-sdk.bst:components/flex.bst
+- freedesktop-sdk.bst:components/bc.bst
 - freedesktop-sdk.bst:components/gzip.bst
 - freedesktop-sdk.bst:components/openssl.bst # Override: Added.
 - freedesktop-sdk.bst:components/python3.bst
@@ -41,6 +41,7 @@ variables:
       debian_arch: amd64
   - arch == "aarch64":
       debian_arch: arm64
+  strip-binaries: ""
 
 environment:
   ARCH: '%{kernel_arch}'
@@ -102,6 +103,9 @@ config:
 
     ln -sr "${targetdir}" "%{install-root}%{indep-libdir}/modules/${release}/build"
 
+  - |
+    %{install-extra}
+
   # BuildStream can cache the content of the buildtree in some cases.
   # For successful builds, we must ensure the private key is deleted so that it
   # can't be pushed to the public artifact cache server.
@@ -136,6 +140,8 @@ public:
       devel:
         (>):
         - '%{bootdir}/System.map'
+    overlap-whitelist:
+    - "%{project_licensedir}/linux/COPYING"
 
 (@):
 - elements/include/linux.yml

elements/components/linux.bst

@@ -9,7 +9,6 @@ build-depends:
 - freedesktop-sdk.bst:components/git-minimal.bst
 - freedesktop-sdk.bst:components/gobject-introspection.bst
 - freedesktop-sdk.bst:components/bison.bst
-- freedesktop-sdk.bst:components/gtk-doc.bst
 
 depends:
 - freedesktop-sdk.bst:components/composefs.bst
@@ -40,20 +39,5 @@ public:
         (>):
         - "%{libdir}/libostree.so"
 
-sources:
-- kind: git_repo
-  url: github:endlessm/ostree.git
-  track: master
-  ref: Release_6.0.7-0-gf6848f2c8be006558c50175575ee8af9ae9b09d2
-- kind: git_module
-  path: libglnx
-  url: gnome:libglnx.git
-  ref: 07e3e49d3e47dfd4265ffb5495111439131715ca
-- kind: git_module
-  path: bsdiff
-  url: github:mendsley/bsdiff.git
-  ref: b817e9491cf7b8699c8462ef9e2657ca4ccd7667
-- kind: git_module
-  path: composefs
-  url: github:containers/composefs.git
-  ref: 412cb5e6aaf516c5e2a7f67e426a25ed2926e101
+(@):
+- elements/include/ostree-source.yml

elements/components/ostree.bst

@@ -1,4 +1,4 @@
-# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.3 core-deps/systemd-base.bst
+# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.5 core-deps/systemd-base.bst
 
 kind: meson
 description:

elements/components/systemd-base.bst

@@ -1,4 +1,4 @@
-# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.3 core/meta-gnome-core-apps.bst
+# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.5 core/meta-gnome-core-apps.bst
 
 # The core set is not expected to change as frequently as core-deps.
 # Adding or removing elements from here should be approved by