Skip to content

Commit bf5ac4d

Browse files
author
Adrien Plazas
committed
Update to gnome-build-meta 48.5
This also drops components/dracut.bst as it was borrowed unchanged from a now older freedesktop-sdk version.
1 parent bb77e8c commit bf5ac4d

18 files changed

+36
-67
lines changed

elements/components/accountsservice.bst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.3 core-deps/accountsservice.bst
1+
# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.5 core-deps/accountsservice.bst
22

33
kind: meson
44
description: |

elements/components/cups-base.bst

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.23 components/cups-base.bst
1+
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/cups-base.bst
22

33
kind: autotools
44
description:
@@ -14,8 +14,10 @@ build-depends:
1414
- freedesktop-sdk.bst:components/systemd.bst
1515

1616
variables:
17+
license-files-extra: NOTICE
1718
# Makefiles not added to build-dir which makes it unusable
1819
build-dir: ''
20+
make-install-args: DSTROOT="%{install-root}" install
1921
conf-local: >-
2022
--enable-debug
2123
--with-components=all
@@ -30,16 +32,14 @@ variables:
3032
3133
config:
3234
install-commands:
33-
- |
34-
make -j1 DSTROOT="%{install-root}" install
35+
(>):
36+
- |
37+
tmpfilesdir="$(pkg-config --variable tmpfilesdir systemd)"
38+
install -Dm644 tmpfiles.conf "%{install-root}${tmpfilesdir}/cups.conf"
3539
36-
- |
37-
tmpfilesdir="$(pkg-config --variable tmpfilesdir systemd)"
38-
install -Dm644 tmpfiles.conf "%{install-root}${tmpfilesdir}/cups.conf"
39-
40-
- |
41-
sysusersdir="$(pkg-config --variable sysusersdir systemd)"
42-
install -Dm644 sysusers.conf "%{install-root}${sysusersdir}/cups.conf"
40+
- |
41+
sysusersdir="$(pkg-config --variable sysusersdir systemd)"
42+
install -Dm644 sysusers.conf "%{install-root}${sysusersdir}/cups.conf"
4343
4444
public:
4545
bst:
@@ -68,12 +68,6 @@ public:
6868
sources:
6969
- kind: git_repo
7070
url: github:OpenPrinting/cups.git
71-
track: v*
72-
exclude:
73-
- "*a*"
74-
- "*b*"
75-
- "*rc*"
76-
- "*op*"
7771
ref: v2.4.10-0-gf3e5cc069c25647619aba8e0aefaa1969d71447e
7872
- kind: local
7973
# Overridde: Modified to name the system group "sudo".

elements/components/dracut.bst

Lines changed: 0 additions & 31 deletions
This file was deleted.

elements/components/flatpak.bst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.23 components/flatpak.bst
1+
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/flatpak.bst
22

33
kind: meson
44
description: |

elements/components/linux-pam-base.bst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.22 components/linux-pam-base.bst
1+
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/linux-pam-base.bst
22

33
kind: meson
44
description: |
@@ -88,6 +88,7 @@ variables:
8888
-Dnis=disabled
8989
-Dselinux=disabled
9090
-Ddocs=disabled
91+
-Delogind=disabled
9192
-Dusergroups=true
9293
9394
config:
@@ -127,4 +128,4 @@ sources:
127128
- kind: git_repo
128129
url: github:linux-pam/linux-pam.git
129130
track: v*
130-
ref: v1.7.0-0-gea980d991196df67cdd56b3f65d210b73218d08a
131+
ref: v1.7.1-0-g693c4f75b10b25e09f70fe0b22f41bdcf9a48968

elements/components/linux-pam.bst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.22 components/linux-pam.bst
1+
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/linux-pam.bst
22

33
kind: manual
44
description: |

elements/components/linux.bst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.22 components/linux.bst
1+
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/linux.bst
22

33
kind: make
44
description: |
@@ -41,6 +41,7 @@ variables:
4141
debian_arch: amd64
4242
- arch == "aarch64":
4343
debian_arch: arm64
44+
strip-binaries: ""
4445

4546
environment:
4647
ARCH: '%{kernel_arch}'
@@ -102,6 +103,9 @@ config:
102103
103104
ln -sr "${targetdir}" "%{install-root}%{indep-libdir}/modules/${release}/build"
104105
106+
- |
107+
%{install-extra}
108+
105109
# BuildStream can cache the content of the buildtree in some cases.
106110
# For successful builds, we must ensure the private key is deleted so that it
107111
# can't be pushed to the public artifact cache server.
@@ -136,6 +140,8 @@ public:
136140
devel:
137141
(>):
138142
- '%{bootdir}/System.map'
143+
overlap-whitelist:
144+
- "%{project_licensedir}/linux/COPYING"
139145

140146
(@):
141147
- elements/include/linux.yml

elements/components/systemd-base.bst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.3 core-deps/systemd-base.bst
1+
# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.5 core-deps/systemd-base.bst
22

33
kind: meson
44
description:

elements/core/meta-gnome-core-apps.bst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.3 core/meta-gnome-core-apps.bst
1+
# utils/update-elements.sh: Derived from gnome-build-meta.bst 48.5 core/meta-gnome-core-apps.bst
22

33
# The core set is not expected to change as frequently as core-deps.
44
# Adding or removing elements from here should be approved by

elements/eos/config/bash-config.bst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.22 components/bash-config.bst
1+
# utils/update-elements.sh: Derived from freedesktop-sdk.bst freedesktop-sdk-24.08.25 components/bash-config.bst
22

33
kind: manual
44
description: |

0 commit comments

Comments
 (0)