author: kx <kx@radix.pro> 2023-12-27 09:18:36 +0300
committer: kx <kx@radix.pro> 2023-12-27 09:18:36 +0300
commit: 527c1e1cb67ffbaefee5603f732c8b32c54157ba
parent: 120e8f405df0f03234d63fad31b9a2a8446b064f
Commit Summary:
Diffstat:
3 files changed, 42 insertions, 71 deletions
diff --git a/packages/a/Makefile b/packages/a/Makefile
index d673dd6..5c2246e 100644
--- a/packages/a/Makefile
+++ b/packages/a/Makefile
@@ -160,7 +160,6 @@ SUBDIRS := CLooG \
todos \
tree \
udisks \
- udisks2 \
upower \
usb-modeswitch \
usb-modeswitch-data \
diff --git a/packages/a/udisks/Makefile b/packages/a/udisks/Makefile
index 5f6d1c5..5672eba 100644
--- a/packages/a/udisks/Makefile
+++ b/packages/a/udisks/Makefile
@@ -1,39 +1,66 @@
#
# Project Home:
# ============
-# https://www.freedesktop.org/wiki/Software/udisks
+# https://github.com/storaged-project/udisks
#
-# Downloads:
-# =========
-# https://hal.freedesktop.org/releases
+# Clone:
+# =====
+# git clone https://github.com/storaged-project/udisks.git
#
-url = https://hal.freedesktop.org/releases
+url = https://github.com/storaged-project
-versions = 1.0.4 1.0.5
+repo_name = udisks
+pkg_name = udisks
+suffix = tar.xz
-pkg_name = udisks
-suffix = tar.gz
+versions = 2.10.1
-tarballs = $(addsuffix .$(suffix), $(addprefix $(pkg_name)-, $(versions)))
-sha1s = $(addsuffix .sha1sum, $(tarballs))
+# List of tags to be extracted:
+TAGS = $(addprefix udisks-, $(versions))
+git_repo = .git_clone
+tarballs = $(addsuffix .tar.xz, $(addprefix $(pkg_name)-, $(versions)))
+sha1s = $(addsuffix .sha1sum, $(tarballs))
-all: $(tarballs) $(sha1s)
+TARGETS = repository_clean
-.PHONY: downloads_clean
-$(tarballs):
- @echo -e "\n======= Downloading source tarballs =======\n"
- @for tarball in $(tarballs) ; do \
- wget -N $(url)/$$tarball ; \
+all: $(TARGETS)
+
+.PHONY: downloads_clean repository_clean
+
+$(git_repo):
+ @echo -e "\n======= Clone $(repo_name).git repository =======\n"
+ @rm -rf $(repo_name)
+ @git clone $(url)/$(repo_name).git $(repo_name)
+ @touch $@
+
+$(tarballs): $(git_repo)
+ @for version in $(versions) ; do \
+ tag=udisks-`echo $$version` ; \
+ if [ ! -f $(repo_name)-$$version.$(suffix) ]; then \
+ echo -e "\n======= Creating '$(repo_name)-$$version.$(suffix)' snapshot =======" ; \
+ ( cd $(repo_name) && \
+ git archive --format=tar --prefix=$(pkg_name)-$$version/ $$tag | \
+ xz >../$(pkg_name)-$$version.$(suffix) ) ; \
+ tar xJf $(pkg_name)-$$version.$(suffix) ; \
+ ( cd $(pkg_name)-$$version ; ./autogen.sh ; rm -rf autom4te.cache .git* .packit.yaml *~ ) ; \
+ tar cJf $(pkg_name)-$$version.$(suffix) $(pkg_name)-$$version ; \
+ rm -rf $(pkg_name)-$$version ; \
+ fi ; \
done
-$(sha1s): %.$(suffix).sha1sum : %.$(suffix)
+$(sha1s): %.tar.xz.sha1sum : %.tar.xz
@for tarball in $< ; do \
- echo -e "\n======= Calculation the '$$tarball' sha1sum =======\n" ; \
+ echo -e "\n======= Calculation the '$$tarball' sha1sum =======" ; \
sha1sum --binary $$tarball > $$tarball.sha1sum ; \
done
+repository_clean: $(sha1s)
+ @echo -e "\n======= Remove cloned $(repo_name).git repository =======\n"
+ @rm -rf $(git_repo) $(repo_name)
+
downloads_clean:
@rm -rf $(tarballs) $(sha1s)
+ @rm -rf $(git_repo) $(repo_name)
diff --git a/packages/a/udisks2/Makefile b/packages/a/udisks2/Makefile
deleted file mode 100644
index 5672eba..0000000
--- a/packages/a/udisks2/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Project Home:
-# ============
-# https://github.com/storaged-project/udisks
-#
-# Clone:
-# =====
-# git clone https://github.com/storaged-project/udisks.git
-#
-
-url = https://github.com/storaged-project
-
-repo_name = udisks
-pkg_name = udisks
-suffix = tar.xz
-
-versions = 2.10.1
-
-# List of tags to be extracted:
-TAGS = $(addprefix udisks-, $(versions))
-
-git_repo = .git_clone
-tarballs = $(addsuffix .tar.xz, $(addprefix $(pkg_name)-, $(versions)))
-sha1s = $(addsuffix .sha1sum, $(tarballs))
-
-TARGETS = repository_clean
-
-
-all: $(TARGETS)
-
-.PHONY: downloads_clean repository_clean
-
-$(git_repo):
- @echo -e "\n======= Clone $(repo_name).git repository =======\n"
- @rm -rf $(repo_name)
- @git clone $(url)/$(repo_name).git $(repo_name)
- @touch $@
-
-$(tarballs): $(git_repo)
- @for version in $(versions) ; do \
- tag=udisks-`echo $$version` ; \
- if [ ! -f $(repo_name)-$$version.$(suffix) ]; then \
- echo -e "\n======= Creating '$(repo_name)-$$version.$(suffix)' snapshot =======" ; \
- ( cd $(repo_name) && \
- git archive --format=tar --prefix=$(pkg_name)-$$version/ $$tag | \
- xz >../$(pkg_name)-$$version.$(suffix) ) ; \
- tar xJf $(pkg_name)-$$version.$(suffix) ; \
- ( cd $(pkg_name)-$$version ; ./autogen.sh ; rm -rf autom4te.cache .git* .packit.yaml *~ ) ; \
- tar cJf $(pkg_name)-$$version.$(suffix) $(pkg_name)-$$version ; \
- rm -rf $(pkg_name)-$$version ; \
- fi ; \
- done
-
-$(sha1s): %.tar.xz.sha1sum : %.tar.xz
- @for tarball in $< ; do \
- echo -e "\n======= Calculation the '$$tarball' sha1sum =======" ; \
- sha1sum --binary $$tarball > $$tarball.sha1sum ; \
- done
-
-repository_clean: $(sha1s)
- @echo -e "\n======= Remove cloned $(repo_name).git repository =======\n"
- @rm -rf $(git_repo) $(repo_name)
-
-downloads_clean:
- @rm -rf $(tarballs) $(sha1s)
- @rm -rf $(git_repo) $(repo_name)