Skip to content

Commit 916b464

Browse files
committed
fix: add pkgconf for ncurses, fix Renovate configs, bump deps
Generate pkgconf files for ncurses, so that menuconfig and potentially other users do not fail due to some symbols being in libtinfo. Make sure Renovate covers all deps (except bc which does not seem to have an easy to read upstream). Signed-off-by: Dmitrii Sharshakov <dmitry.sharshakov@siderolabs.com>
1 parent 11f0337 commit 916b464

File tree

5 files changed

+43
-28
lines changed

5 files changed

+43
-28
lines changed

.github/renovate.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,15 @@
8282
"git://git.kernel.org/pub/scm/libs/libcap/libcap.git",
8383
"git://git.savannah.gnu.org/autoconf.git",
8484
"git://git.savannah.gnu.org/bash.git",
85-
"https://gitlab.kitware.com/cmake/cmake.git"
85+
"https://gitlab.kitware.com/cmake/cmake.git",
86+
"git://git.savannah.gnu.org/libunistring.git"
8687
]
8788
},
8889
{
8990
"versioning": "regex:^(?<major>\\d+)\\.?(?<minor>\\d+)?\\.?(?<patch>\\d+)?$",
9091
"matchPackageNames": [
9192
"git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git",
92-
"systemd/systemd"
93+
"gentoo/gpep517"
9394
]
9495
},
9596
{
@@ -98,6 +99,7 @@
9899
"curl/curl",
99100
"libexpat/libexpat",
100101
"file/file",
102+
"thom311/libnl",
101103
"git://git.savannah.gnu.org/cpio.git",
102104
"git://git.savannah.gnu.org/tar.git"
103105
]
@@ -108,6 +110,12 @@
108110
"Perl/perl5"
109111
]
110112
},
113+
{
114+
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.?(?<patch>\\d+)?\\.?(?<build>\\d+)?$",
115+
"matchPackageNames": [
116+
"https://salsa.debian.org/clint/fakeroot.git"
117+
]
118+
},
111119
{
112120
"versioning": "regex:^(?<major>\\d+)-(?<minor>\\d+)-(?<patch>\\d+)$",
113121
"matchPackageNames": [

.kres.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,26 @@ spec:
4848
- git://git.savannah.gnu.org/autoconf.git
4949
- git://git.savannah.gnu.org/bash.git
5050
- https://gitlab.kitware.com/cmake/cmake.git
51+
- git://git.savannah.gnu.org/libunistring.git
5152
versioning: 'regex:^(?<major>\d+)\.(?<minor>\d+)\.?(?<patch>\d+)?$'
5253
- matchPackageNames:
5354
- git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
54-
- systemd/systemd
55+
- gentoo/gpep517
5556
versioning: 'regex:^(?<major>\d+)\.?(?<minor>\d+)?\.?(?<patch>\d+)?$'
5657
- matchPackageNames:
5758
- curl/curl
5859
- libexpat/libexpat
5960
- file/file
61+
- thom311/libnl
6062
- git://git.savannah.gnu.org/cpio.git
6163
- git://git.savannah.gnu.org/tar.git
6264
versioning: 'regex:^(?<major>\d+)_(?<minor>\d+)_?(?<patch>\d+)?$'
6365
- matchPackageNames:
6466
- Perl/perl5
6567
versioning: 'regex:^(?<major>\d+)\.(?<minor>\d[02468]+)\.(?<patch>\d+)$'
68+
- matchPackageNames:
69+
- https://salsa.debian.org/clint/fakeroot.git
70+
versioning: 'regex:^(?<major>\d+)\.(?<minor>\d+)\.?(?<patch>\d+)?\.?(?<build>\d+)?$'
6671
- matchPackageNames:
6772
- homebrew/ca-certificates
6873
versioning: 'regex:^(?<major>\d+)-(?<minor>\d+)-(?<patch>\d+)$'

Pkgfile

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ vars:
7777
dtc_sha512: 30f3611175a5c29556282f3f2894701a5837eb869608d89d78c280af448bbc3a5b6c83f51c28f991847c0eb7c42aa57599bbc31433f1b3b2c8d162cb2169b91f
7878

7979
# renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=davea42/libdwarf-code
80-
dwarfutils_version: 2.1.0
81-
dwarfutils_sha256: 461bd29cbb9a41c26a25b0e527c3736c772bb7a89f6260d1edb39ab105226e06
82-
dwarfutils_sha512: fd58ee55fc7f685f70cf7e79733d926d7064752c4e1ffe3eede1b1cc1090e127c76c59def3a3b32d5514384cd901bb69f9f2afeefa518d0ce9460f529b498078
80+
dwarfutils_version: 2.2.0
81+
dwarfutils_sha256: 54c0abbbeb4190bd1babb5d28574d2b20c2309343ec764cc7ca611e527ee4a42
82+
dwarfutils_sha512: 1a5145b3b9bebbae6e6691590521c56327adb92c0ae95f145bcba8e4402b637d1479c2c6adad069ef9e0e36b2f7c8afc2811173f39e444418e2de7f4277ec393
8383

8484
# renovate: datasource=git-tags extractVersion=^elfutils-(?<version>.*)$ depName=git://sourceware.org/git/elfutils.git
8585
elfutils_version: 0.193
@@ -91,10 +91,10 @@ vars:
9191
expat_sha256: 59c31441fec9a66205307749eccfee551055f2d792f329f18d97099e919a3b2f
9292
expat_sha512: 92dd8a31a88ca73d5d8890be40c231ec037d8d13f6059a88bcf7bfaaa77c1c94dc2874f2dae508c0d077a3798bc006cfe9d7d0a918e08a67149d332c7fce4d23
9393

94-
# renovate: datasource=git-tags extractVersion=^upstream/(?<version>.*)$ depName=git://salsa.debian.org/clint/fakeroot.git
95-
fakeroot_version: 1.36
96-
fakeroot_sha256: 5128dd5df59955d60453aea1817d2f31c29ffb8b8addcc5d7e200460278a6b0a
97-
fakeroot_sha512: 1ff4cfe8bd4637652027b9e994ed39bf9885d6ea1608050ff21343dc2977c0607c2af235f51376e086ec88ee975da5cb7115a9888ee9437c927426a2eac1bf4b
94+
# renovate: datasource=git-tags extractVersion=^upstream/(?<version>.*)$ depName=https://salsa.debian.org/clint/fakeroot.git
95+
fakeroot_version: 1.37.1.2
96+
fakeroot_sha256: 2ffa2384d4b8f8d59ee54d94fa12d3ecdfe04d51dfa9c4e4668ba8b3c6e3424e
97+
fakeroot_sha512: 2de524e2ccbf5f08d446856439b82028e2a90eec9dc94cb2da829f314cfa700bb0cecf0a86222dc3d343f406364133f94807755643c71e7101439ae1362be2cf
9898

9999
# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.savannah.gnu.org/findutils.git
100100
findutils_version: 4.10.0
@@ -167,20 +167,20 @@ vars:
167167
libffi_sha256: f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc
168168
libffi_sha512: 76974a84e3aee6bbd646a6da2e641825ae0b791ca6efdc479b2d4cbcd3ad607df59cffcf5031ad5bd30822961a8c6de164ac8ae379d1804acd388b1975cdbf4d
169169

170-
# renovate datasource=github-releases extractVersion=^libnl(?<version>.*)$ depName=thom311/libnl
171-
libnl_version: 3_7_0
172-
libnl_sha256: 9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939
173-
libnl_sha512: 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041
170+
# renovate: datasource=github-tags extractVersion=^libnl(?<version>.*)$ depName=thom311/libnl
171+
libnl_version: 3_11_0
172+
libnl_sha256: 2a56e1edefa3e68a7c00879496736fdbf62fc94ed3232c0baba127ecfa76874d
173+
libnl_sha512: 69ecec6e792fc7b9c443fff8742cf45782af5c5c4664687440942eaeb616ba7b4ed2b606e33c5d86e44e6b49a9c79a1fed4b7c77781a059e13cf6a844d94530e
174174

175175
# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=https://gitlab.com/gnutls/libtasn1.git
176176
libtasn1_version: 4.20.0
177177
libtasn1_sha256: 92e0e3bd4c02d4aeee76036b2ddd83f0c732ba4cda5cb71d583272b23587a76c
178178
libtasn1_sha512: 0c0660085f5e80537aa3d65197967029be6cc5e27d7029789713902989c1694fdb49421ae0415b79b953e11893bb4bdaada85f7aff847dd0bb4075c91887e7b4
179179

180180
# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.savannah.gnu.org/libunistring.git
181-
libunistring_version: 1.1
182-
libunistring_sha256: 827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98
183-
libunistring_sha512: 01a4267bbd301ea5c389b17ee918ae5b7d645da8b2c6c6f0f004ff2dead9f8e50cda2c6047358890a5fceadc8820ffc5154879193b9bb8970f3fb1fea1f411d6
181+
libunistring_version: 1.4.1
182+
libunistring_sha256: 67d88430892527861903788868c77802a217b0959990f7449f2976126a307763
183+
libunistring_sha512: e0838b4324193aa927c6a3d647b9a482f12e11525d0cf2b5f0e6cf6b9afc9f2ee751d39d72e3c980bac3fc91e0d9d043c4a1c5662dde3cc26c52312d224d80f0
184184

185185
# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.savannah.gnu.org/libtool.git
186186
libtool_version: 2.5.4
@@ -268,7 +268,7 @@ vars:
268268
pkgconf_sha256: 79721badcad1987dead9c3609eb4877ab9b58821c06bdacb824f2c8897c11f2a
269269
pkgconf_sha512: 53244f372ea21125a1d97c5b89a84299740b55a66165782e807ed23adab3a07408a1547f1f40156e3060359660d07f49846c8b4893beef10ac9440ab7e8611cc
270270

271-
# renovate: datasource=github-tags depName=eliben/pyelftools
271+
# renovate: datasource=github-tags versioning=python depName=eliben/pyelftools
272272
pyelftools_version: v0.31
273273
pyelftools_sha256: 24815cbfff9c5f68f5268983f55d969540a087bfdaa73c93f1a88e2a771f80f1
274274
pyelftools_sha512: 7f4ef37da7fda75125cb95ced2f3084848943592eff7deae7ae917508f1cd5281c96960ee3bbc6e503e71a4e2196622cd68cc67e3df1f4cd99b9b675f14fd58c
@@ -278,42 +278,42 @@ vars:
278278
python_sha256: 2299dae542d395ce3883aca00d3c910307cd68e0b2f7336098c8e7b7eee9f3e9
279279
python_sha512: 46e9e205c3a084cba68bf7f267ab2fd0862a05430165e0eb713f2d6b3a1a4452f72f563de5de55caea824be9df56f66dd568f4814941667a9bb0954229772c53
280280

281-
# renovate: datasource=github-releases depName=pypa/build
281+
# renovate: datasource=github-releases versioning=python depName=pypa/build
282282
python_build_version: 1.3.0
283283
python_build_sha256: fd7a275d4b34e2b5b4c73fb57ae3c8239b54e4d09752eb540d4167c77bfa043d
284284
python_build_sha512: f34450ffc92a434af2614f4341b38c8feed18ce9a799196bff3f735afc52334cacb34d2a831c3264bbfaacda642a5e4defe3842f8010cd687d47e2d018a191d0
285285

286-
# renovate: datasource=github-tags depName=pypa/flit
286+
# renovate: datasource=github-tags versioning=python depName=pypa/flit
287287
python_flit_core_version: 3.12.0
288288
python_flit_core_sha256: c157ff92c01f4bb169182722ff76aadac113926b729215e91909021aa56e2ea3
289289
python_flit_core_sha512: ff6df66dfdae6fdf7b277cc3fbb7c9a569103cbe82a3e3ce6f315ec6adec46be8692eba4549a66b3af537d128e6b57ed8f49316b705636466c25674198503643
290290

291-
# renovate: datasource=github-tags depName=projg2/gpep517
292-
python_gpep517_version: v19
291+
# renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ versioning=python depName=gentoo/gpep517
292+
python_gpep517_version: 19
293293
python_gpep517_sha256: 17879b79edbb5a21d3dca6cfae997bda8e4c99254caf16616a6ae70d15a43c09
294294
python_gpep517_sha512: 463c3812f388ea7ef83aaf6b3b90de4036b0a8200038a654621822c02d46627f7adf2ed4c7accf016293f89b8c3a2080d9ac80d2f82caaa3fdd370aa98c4335b
295295

296-
# renovate: datasource=github-tags depName=pypa/installer
296+
# renovate: datasource=github-tags versioning=python depName=pypa/installer
297297
python_installer_version: 0.7.0
298298
python_installer_sha256: e1589201863a6b6f570ce2f9994febe54a8d9196e0cc54fd331cd7ffd728fb86
299299
python_installer_sha512: a509c6ea9d88b8527cce0428ca6109077820cb9aa352967a389012bac40f8ec04039ab73710f4fb32b32ed20affd520ce0ba16ba18d9d380ce0af1f51fe8e2c6
300300

301-
# renovate: datasource=github-releases depName=pallets/jinja
301+
# renovate: datasource=github-releases versioning=python depName=pallets/jinja
302302
python_jinja2_version: 3.1.6
303303
python_jinja2_sha256: 2074b22a72caa65474902234b320d73463d6d4c223ee49f4b433495758356337
304304
python_jinja2_sha512: a3558f89d9d60676583bfc05e8987e9c486c2335affb71c9733b93040d56a2f97fb036974f1be1bf82c5b0767f482b2e795d58ea35456fcfe7e705f5e6b7a778
305305

306-
# renovate: datasource=github-releases depName=pallets/markupsafe
306+
# renovate: datasource=github-releases versioning=python depName=pallets/markupsafe
307307
python_markupsafe_version: 3.0.3
308308
python_markupsafe_sha256: f1d9d06c34515dd3ad210ec769da613057b536d11d6c039183b87757a883a254
309309
python_markupsafe_sha512: 2259dba158c37d06f87ef208603706f1d79b536124cec599ee634717d6061cccd89ee4bc8c35aa40ce9c728d595f2b802b6e68e9c7219c2f17135ed91854d777
310310

311-
# renovate: datasource=github-releases depName=pypa/packaging
311+
# renovate: datasource=github-releases versioning=python depName=pypa/packaging
312312
python_packaging_version: 25.0
313313
python_packaging_sha256: 15b6ba95eb12d8f99dcf215ea37cbea16812ef28358e8ef3d9344acb827acac1
314314
python_packaging_sha512: fb8419f81f0f817440c0b297fc6e963832e219e7a324bf4e0321f1e131a4822f17a19f2eb033a8d4adb622ccb16db59776ec44906a0c0b34f2877b59b9558c18
315315

316-
# renovate: datasource=github-releases extractVersion=^v(?<version>.*)$ depName=pypa/setuptools
316+
# renovate: datasource=github-releases versioning=python extractVersion=^v(?<version>.*)$ depName=pypa/setuptools
317317
python_setuptools_version: 80.9.0
318318
python_setuptools_sha256: f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c
319319
python_setuptools_sha512: 36eb1f219d29c6b9e135936bde2001ad70a971c8069cd0175d3a5325b450e6843a903d3f70043c9f534768ebeab8ab0c544b8f44456555d333f1ed72daa5c18b

ncurses/pkg.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ steps:
2626
--prefix=/usr \
2727
--with-shared \
2828
--with-termlib=tinfo \
29+
--enable-pc-files \
30+
--with-pkg-config-libdir=/usr/lib/pkgconfig \
2931
--without-debug \
3032
--without-ada \
3133
--without-cxx-binding \

python-gpep517/pkg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies:
44
- stage: base
55
steps:
66
- sources:
7-
- url: https://github.com/projg2/gpep517/archive/refs/tags/{{ .python_gpep517_version }}.tar.gz
7+
- url: https://github.com/projg2/gpep517/archive/refs/tags/v{{ .python_gpep517_version }}.tar.gz
88
destination: python_gpep517.tar.gz
99
sha256: "{{ .python_gpep517_sha256 }}"
1010
sha512: "{{ .python_gpep517_sha512 }}"

0 commit comments

Comments
 (0)