Skip to content

Commit 8ad232d

Browse files
purpleideapurpleidea
committed
make: Update fedora release versions
These were untested.
1 parent 01b7721 commit 8ad232d

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎Makefile

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
SHELL = /usr/bin/env bash
3131
.PHONY: all art cleanart version program lang path deps run race generate build build-debug crossbuild clean test gofmt yamlfmt format docs
3232
.PHONY: rpmbuild mkdirs rpm srpm spec tar upload upload-sources upload-srpms upload-rpms upload-releases copr tag
33-
.PHONY: mkosi mkosi_fedora-30 mkosi_fedora-29 mkosi_centos-7 mkosi_debian-10 mkosi_ubuntu-bionic mkosi_archlinux
34-
.PHONY: release releases_path release_binary_amd64 release_binary_arm64 release_fedora-30 release_fedora-29 release_centos-7 release_debian-10 release_ubuntu-bionic release_archlinux
33+
.PHONY: mkosi mkosi_fedora-39 mkosi_fedora-38 mkosi_centos-7 mkosi_debian-10 mkosi_ubuntu-bionic mkosi_archlinux
34+
.PHONY: release releases_path release_binary_amd64 release_binary_arm64 release_fedora-39 release_fedora-38 release_centos-7 release_debian-10 release_ubuntu-bionic release_archlinux
3535
.PHONY: funcgen
3636
.SILENT: clean
3737

@@ -74,26 +74,26 @@ GOHOSTARCH = $(shell go env GOHOSTARCH)
7474

7575
TOKEN_BINARY_AMD64 = binary-linux-amd64
7676
TOKEN_BINARY_ARM64 = binary-linux-arm64
77-
TOKEN_FEDORA-30 = fedora-30
78-
TOKEN_FEDORA-29 = fedora-29
77+
TOKEN_FEDORA-39 = fedora-39
78+
TOKEN_FEDORA-38 = fedora-38
7979
TOKEN_CENTOS-7 = centos-7
8080
TOKEN_DEBIAN-10 = debian-10
8181
TOKEN_UBUNTU-BIONIC = ubuntu-bionic
8282
TOKEN_ARCHLINUX = archlinux
8383

8484
FILE_BINARY_AMD64 = mgmt-linux-amd64-$(VERSION)
8585
FILE_BINARY_ARM64 = mgmt-linux-arm64-$(VERSION)
86-
FILE_FEDORA-30 = mgmt-$(TOKEN_FEDORA-30)-$(VERSION)-1.x86_64.rpm
87-
FILE_FEDORA-29 = mgmt-$(TOKEN_FEDORA-29)-$(VERSION)-1.x86_64.rpm
86+
FILE_FEDORA-39 = mgmt-$(TOKEN_FEDORA-39)-$(VERSION)-1.x86_64.rpm
87+
FILE_FEDORA-38 = mgmt-$(TOKEN_FEDORA-38)-$(VERSION)-1.x86_64.rpm
8888
FILE_CENTOS-7 = mgmt-$(TOKEN_CENTOS-7)-$(VERSION)-1.x86_64.rpm
8989
FILE_DEBIAN-10 = mgmt_$(TOKEN_DEBIAN-10)_$(VERSION)_amd64.deb
9090
FILE_UBUNTU-BIONIC = mgmt_$(TOKEN_UBUNTU-BIONIC)_$(VERSION)_amd64.deb
9191
FILE_ARCHLINUX = mgmt-$(TOKEN_ARCHLINUX)-$(VERSION)-1-x86_64.pkg.tar.xz
9292

9393
PKG_BINARY_AMD64 = releases/$(VERSION)/$(TOKEN_BINARY_AMD64)/$(FILE_BINARY_AMD64)
9494
PKG_BINARY_ARM64 = releases/$(VERSION)/$(TOKEN_BINARY_ARM64)/$(FILE_BINARY_ARM64)
95-
PKG_FEDORA-30 = releases/$(VERSION)/$(TOKEN_FEDORA-30)/$(FILE_FEDORA-30)
96-
PKG_FEDORA-29 = releases/$(VERSION)/$(TOKEN_FEDORA-29)/$(FILE_FEDORA-29)
95+
PKG_FEDORA-39 = releases/$(VERSION)/$(TOKEN_FEDORA-39)/$(FILE_FEDORA-39)
96+
PKG_FEDORA-38 = releases/$(VERSION)/$(TOKEN_FEDORA-38)/$(FILE_FEDORA-38)
9797
PKG_CENTOS-7 = releases/$(VERSION)/$(TOKEN_CENTOS-7)/$(FILE_CENTOS-7)
9898
PKG_DEBIAN-10 = releases/$(VERSION)/$(TOKEN_DEBIAN-10)/$(FILE_DEBIAN-10)
9999
PKG_UBUNTU-BIONIC = releases/$(VERSION)/$(TOKEN_UBUNTU-BIONIC)/$(FILE_UBUNTU-BIONIC)
@@ -386,13 +386,13 @@ tag: ## tags a new release
386386
#
387387
# mkosi
388388
#
389-
mkosi: mkosi_fedora-30 mkosi_fedora-29 mkosi_centos-7 mkosi_debian-10 mkosi_ubuntu-bionic mkosi_archlinux ## builds distro packages via mkosi
389+
mkosi: mkosi_fedora-39 mkosi_fedora-38 mkosi_centos-7 mkosi_debian-10 mkosi_ubuntu-bionic mkosi_archlinux ## builds distro packages via mkosi
390390

391-
mkosi_fedora-30: releases/$(VERSION)/.mkdir
391+
mkosi_fedora-39: releases/$(VERSION)/.mkdir
392392
@title='$@' ; echo "Generating: $${title#'mkosi_'} via mkosi..."
393393
@title='$@' ; distro=$${title#'mkosi_'} ; ./misc/mkosi/make.sh $${distro} `realpath "releases/$(VERSION)/"`
394394

395-
mkosi_fedora-29: releases/$(VERSION)/.mkdir
395+
mkosi_fedora-38: releases/$(VERSION)/.mkdir
396396
@title='$@' ; echo "Generating: $${title#'mkosi_'} via mkosi..."
397397
@title='$@' ; distro=$${title#'mkosi_'} ; ./misc/mkosi/make.sh $${distro} `realpath "releases/$(VERSION)/"`
398398

@@ -424,23 +424,23 @@ releases_path:
424424

425425
release_binary_amd64: $(PKG_BINARY_AMD64)
426426
release_binary_arm64: $(PKG_BINARY_ARM64)
427-
release_fedora-30: $(PKG_FEDORA-30)
428-
release_fedora-29: $(PKG_FEDORA-29)
427+
release_fedora-39: $(PKG_FEDORA-39)
428+
release_fedora-38: $(PKG_FEDORA-38)
429429
release_centos-7: $(PKG_CENTOS-7)
430430
release_debian-10: $(PKG_DEBIAN-10)
431431
release_ubuntu-bionic: $(PKG_UBUNTU-BIONIC)
432432
release_archlinux: $(PKG_ARCHLINUX)
433433

434-
releases/$(VERSION)/mgmt-release.url: $(PKG_BINARY_AMD64) $(PKG_BINARY_ARM64) $(PKG_FEDORA-30) $(PKG_FEDORA-29) $(PKG_CENTOS-7) $(PKG_DEBIAN-10) $(PKG_UBUNTU-BIONIC) $(PKG_ARCHLINUX) $(SHA256SUMS_ASC)
434+
releases/$(VERSION)/mgmt-release.url: $(PKG_BINARY_AMD64) $(PKG_BINARY_ARM64) $(PKG_FEDORA-39) $(PKG_FEDORA-38) $(PKG_CENTOS-7) $(PKG_DEBIAN-10) $(PKG_UBUNTU-BIONIC) $(PKG_ARCHLINUX) $(SHA256SUMS_ASC)
435435
@echo "Pushing git tag $(VERSION) to origin..."
436436
git push origin $(VERSION)
437437
@echo "Creating github release..."
438438
hub release create \
439439
-F <( echo -e "$(VERSION)\n";echo "Verify the signatures of all packages before you use them. The signing key can be downloaded from https://purpleidea.com/contact/#pgp-key to verify the release." ) \
440440
-a $(PKG_BINARY_AMD64) \
441441
-a $(PKG_BINARY_ARM64) \
442-
-a $(PKG_FEDORA-30) \
443-
-a $(PKG_FEDORA-29) \
442+
-a $(PKG_FEDORA-39) \
443+
-a $(PKG_FEDORA-38) \
444444
-a $(PKG_CENTOS-7) \
445445
-a $(PKG_DEBIAN-10) \
446446
-a $(PKG_UBUNTU-BIONIC) \
@@ -452,7 +452,7 @@ releases/$(VERSION)/mgmt-release.url: $(PKG_BINARY_AMD64) $(PKG_BINARY_ARM64) $(
452452
|| rm -f releases/$(VERSION)/mgmt-release.url
453453

454454
releases/$(VERSION)/.mkdir:
455-
mkdir -p releases/$(VERSION)/{$(TOKEN_BINARY_AMD64),$(TOKEN_BINARY_ARM64),$(TOKEN_FEDORA-30),$(TOKEN_FEDORA-29),$(TOKEN_CENTOS-7),$(TOKEN_DEBIAN-10),$(TOKEN_UBUNTU-BIONIC),$(TOKEN_ARCHLINUX)}/ && touch releases/$(VERSION)/.mkdir
455+
mkdir -p releases/$(VERSION)/{$(TOKEN_BINARY_AMD64),$(TOKEN_BINARY_ARM64),$(TOKEN_FEDORA-39),$(TOKEN_FEDORA-38),$(TOKEN_CENTOS-7),$(TOKEN_DEBIAN-10),$(TOKEN_UBUNTU-BIONIC),$(TOKEN_ARCHLINUX)}/ && touch releases/$(VERSION)/.mkdir
456456

457457
$(PKG_BINARY_AMD64): build/mgmt-linux-amd64 releases/$(VERSION)/.mkdir
458458
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; echo "Building: $${distro} package..."
@@ -462,21 +462,21 @@ $(PKG_BINARY_ARM64): build/mgmt-linux-arm64 releases/$(VERSION)/.mkdir
462462
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; echo "Building: $${distro} package..."
463463
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; cp -a build/mgmt-linux-arm64 $(PKG_BINARY_ARM64)
464464

465-
releases/$(VERSION)/$(TOKEN_FEDORA-30)/changelog: $(PROGRAM) releases/$(VERSION)/.mkdir
465+
releases/$(VERSION)/$(TOKEN_FEDORA-39)/changelog: $(PROGRAM) releases/$(VERSION)/.mkdir
466466
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; echo "Generating: $${distro} changelog..."
467467
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; ./misc/make-rpm-changelog.sh "$${distro}" $(VERSION)
468468

469-
$(PKG_FEDORA-30): releases/$(VERSION)/$(TOKEN_FEDORA-30)/changelog
469+
$(PKG_FEDORA-39): releases/$(VERSION)/$(TOKEN_FEDORA-39)/changelog
470470
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; echo "Building: $${distro} package..."
471-
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; ./misc/fpm-pack.sh $${distro} $(VERSION) "$(FILE_FEDORA-30)" libvirt-devel augeas-devel
471+
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; ./misc/fpm-pack.sh $${distro} $(VERSION) "$(FILE_FEDORA-39)" libvirt-devel augeas-devel
472472

473-
releases/$(VERSION)/$(TOKEN_FEDORA-29)/changelog: $(PROGRAM) releases/$(VERSION)/.mkdir
473+
releases/$(VERSION)/$(TOKEN_FEDORA-38)/changelog: $(PROGRAM) releases/$(VERSION)/.mkdir
474474
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; echo "Generating: $${distro} changelog..."
475475
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; ./misc/make-rpm-changelog.sh "$${distro}" $(VERSION)
476476

477-
$(PKG_FEDORA-29): releases/$(VERSION)/$(TOKEN_FEDORA-29)/changelog
477+
$(PKG_FEDORA-38): releases/$(VERSION)/$(TOKEN_FEDORA-38)/changelog
478478
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; echo "Building: $${distro} package..."
479-
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; ./misc/fpm-pack.sh $${distro} $(VERSION) "$(FILE_FEDORA-29)" libvirt-devel augeas-devel
479+
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; ./misc/fpm-pack.sh $${distro} $(VERSION) "$(FILE_FEDORA-38)" libvirt-devel augeas-devel
480480

481481
releases/$(VERSION)/$(TOKEN_CENTOS-7)/changelog: $(PROGRAM) releases/$(VERSION)/.mkdir
482482
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; echo "Generating: $${distro} changelog..."
@@ -506,10 +506,10 @@ $(PKG_ARCHLINUX): $(PROGRAM) releases/$(VERSION)/.mkdir
506506
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; echo "Building: $${distro} package..."
507507
@title='$(@D)' ; distro=$${title#'releases/$(VERSION)/'} ; ./misc/fpm-pack.sh $${distro} $(VERSION) "$(FILE_ARCHLINUX)" libvirt augeas
508508

509-
$(SHA256SUMS): $(PKG_BINARY_AMD64) $(PKG_BINARY_ARM64) $(PKG_FEDORA-30) $(PKG_FEDORA-29) $(PKG_CENTOS-7) $(PKG_DEBIAN-10) $(PKG_UBUNTU-BIONIC) $(PKG_ARCHLINUX)
509+
$(SHA256SUMS): $(PKG_BINARY_AMD64) $(PKG_BINARY_ARM64) $(PKG_FEDORA-39) $(PKG_FEDORA-38) $(PKG_CENTOS-7) $(PKG_DEBIAN-10) $(PKG_UBUNTU-BIONIC) $(PKG_ARCHLINUX)
510510
@# remove the directory separator in the SHA256SUMS file
511511
@echo "Generating: sha256 sum..."
512-
sha256sum $(PKG_BINARY_AMD64) $(PKG_BINARY_ARM64) $(PKG_FEDORA-30) $(PKG_FEDORA-29) $(PKG_CENTOS-7) $(PKG_DEBIAN-10) $(PKG_UBUNTU-BIONIC) $(PKG_ARCHLINUX) | awk -F '/| ' '{print $$1" "$$6}' > $(SHA256SUMS)
512+
sha256sum $(PKG_BINARY_AMD64) $(PKG_BINARY_ARM64) $(PKG_FEDORA-39) $(PKG_FEDORA-38) $(PKG_CENTOS-7) $(PKG_DEBIAN-10) $(PKG_UBUNTU-BIONIC) $(PKG_ARCHLINUX) | awk -F '/| ' '{print $$1" "$$6}' > $(SHA256SUMS)
513513

514514
$(SHA256SUMS_ASC): $(SHA256SUMS)
515515
@echo "Signing sha256 sum..."

‎misc/mkosi/mkosi.default.fedora-29 renamed to ‎misc/mkosi/mkosi.default.fedora-38

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Distribution]
22
Distribution=fedora
3-
Release=29
3+
Release=38
44

55
[Output]
66
Format=raw_btrfs

‎misc/mkosi/mkosi.default.fedora-30 renamed to ‎misc/mkosi/mkosi.default.fedora-39

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Distribution]
22
Distribution=fedora
3-
Release=30
3+
Release=39
44

55
[Output]
66
Format=raw_btrfs

0 commit comments

Comments
 (0)