Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to blivet-3.1.7 #4

Merged
merged 2 commits into from Feb 14, 2020
Merged

Update to blivet-3.1.7 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
551ed03
Update to blivet-3.1.7
fepitre Feb 9, 2020
6f69f9d
get-sources: use Qubes repository
fepitre Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 10 additions & 8 deletions Makefile
View file
Open in desktop
Expand Up @@ -2,27 +2,29 @@ DIST ?= fc31
VERSION := $(shell cat version)
REL := $(shell cat rel)

SRC_RPM := python-blivet-$(VERSION)-$(REL).$(DIST).src.rpm
FEDORA_SOURCES := https://src.fedoraproject.org/rpms/python-blivet/raw/f$(subst fc,,$(DIST))/f/sources

DISTFILES_MIRROR ?= http://ftp.qubes-os.org/distfiles/
SRC_FILE := blivet-$(VERSION).tar.gz blivet-$(VERSION)-tests.tar.gz

BUILDER_DIR ?= ../..
SRC_DIR ?= qubes-src
UNTRUSTED_SUFF := .UNTRUSTED
FETCH_CMD := $(BUILDER_DIR)/$(SRC_DIR)/builder-rpm/scripts/get_sources_from_srpm
FETCH_CMD := wget --no-use-server-timestamps -q -O

SHELL := /bin/bash

%: %.sha512 %$(UNTRUSTED_SUFF)
%: %.sha512
@$(FETCH_CMD) $@$(UNTRUSTED_SUFF) $(DISTFILES_MIRROR)$@
@sha512sum --status -c <(printf "$$(cat $<) -\n") <$@$(UNTRUSTED_SUFF) || \
{ echo "Wrong SHA512 checksum on $@$(UNTRUSTED_SUFF)!"; exit 1; }
@mv $@$(UNTRUSTED_SUFF) $@

$(SRC_FILE:%=%$(UNTRUSTED_SUFF)):
@$(FETCH_CMD) $(DIST) $(SRC_RPM) $(SRC_FILE)

.PHONY: get-sources
get-sources: $(SRC_FILE)

.PHONY: verify-sources
verify-sources:
@true

.PHONY: update-sources
update-sources:
@$(BUILDER_DIR)/$(SRC_DIR)/builder-rpm/scripts/generate-hashes-from-sources $(FEDORA_SOURCES)
1 change: 0 additions & 1 deletion blivet-3.1.6-tests.tar.gz.sha512
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion blivet-3.1.6.tar.gz.sha512
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions blivet-3.1.7-tests.tar.gz.sha512
View file
Open in desktop
@@ -0,0 +1 @@
700dc66c208b2da5083348eebfb75730735fa52382df30ab387ad657c2c8c9536bc13cd5d96e5e15e127b819d93adc5c08cc65c9df514f1a1e9aaacf60e224f3
1 change: 1 addition & 0 deletions blivet-3.1.7.tar.gz.sha512
View file
Open in desktop
@@ -0,0 +1 @@
c98772bc423016e7a495d57f3c1f1fc32f325a442e5757cc391dcd67b4ef5ca32c9a115173fa5d584cfe768d4a6f709705b266273410bc7166962acb52dff898
2 changes: 1 addition & 1 deletion version
View file
Open in desktop
@@ -1 +1 @@
3.1.6
3.1.7