diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/FETCH_HEAD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/FETCH_HEAD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/FETCH_HEAD 2024-10-29 20:43:48.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/FETCH_HEAD 2024-10-29 19:02:32.000000000 +0000 @@ -1,8 +1,8 @@ -305a2febd2f7a86258f353baa47743ed4c621839 branch 'dep/fedora-42.x' of https://github.com/BrycensRanch/Rokon +14b62cbd28d25d09411c35ba85e4c643bf25a8c6 branch 'dep/fedora-42.x' of https://github.com/BrycensRanch/Rokon 9a426ad20da0dfdcced251637919de709135ab77 branch 'dep/github.com-golangci-golangci-lint-1.x' of https://github.com/BrycensRanch/Rokon -dbe14c00982b08eef49a2c94c173f6cebb6e0c39 branch 'feat/bsd-package' of https://github.com/BrycensRanch/Rokon +157074012eecdc6e49882c18051f644e353bdc3e branch 'feat/bsd-package' of https://github.com/BrycensRanch/Rokon 7c0d0fefae353d98c4ac193aabb66b4e87b170b7 branch 'feat/roku-discover' of https://github.com/BrycensRanch/Rokon a2009e298f03aaaede978eab2918ac191b18145b branch 'feat/roku-discover-2' of https://github.com/BrycensRanch/Rokon -699d0a438bf043bab2fb619569ad48c9be6de933 branch 'master' of https://github.com/BrycensRanch/Rokon +2c5ce91606c5c91e624881189bb53eac13f4a025 branch 'master' of https://github.com/BrycensRanch/Rokon a29243f15d13d5ba742346b31efc7ee8d4c3205c branch 'origin/master' of https://github.com/BrycensRanch/Rokon 95fcfcdc9da3bcfdeca71b5fead33f3da5bcdf6a branch 'renovate/configure' of https://github.com/BrycensRanch/Rokon diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/ORIG_HEAD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/ORIG_HEAD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/ORIG_HEAD 2024-10-29 20:43:46.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/ORIG_HEAD 2024-10-29 14:59:36.000000000 +0000 @@ -1 +1 @@ -2e2d3ca9014413cf2673c81b65a84650b84335f6 +58cda32c5e506246c098f444e1cb88a2ce1114b7 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/config /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/config --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/config 2024-10-29 20:43:48.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/config 2024-10-29 19:02:32.000000000 +0000 @@ -20,5 +20,5 @@ gpgsign = false [http "https://github.com/"] - extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX1RtSHdIeThkbTdCOXg0c3R0dm1uZzJza0FPWGdyQzQxVG5IYQ== + extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX2hpMGtDQk1xbWpBdTJWYVU0anNxY0hUQXBERHB1TjFweW9GcA== [branch "master"] remote = origin Binary files /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/index and /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/index differ diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/HEAD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/HEAD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/HEAD 2024-10-29 20:43:48.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/HEAD 2024-10-29 19:02:32.000000000 +0000 @@ -421,5 +421,2 @@ 58cda32c5e506246c098f444e1cb88a2ce1114b7 58cda32c5e506246c098f444e1cb88a2ce1114b7 Brycen G 1730228552 -0400 checkout: moving from master to HEAD 58cda32c5e506246c098f444e1cb88a2ce1114b7 2c5ce91606c5c91e624881189bb53eac13f4a025 Brycen G 1730228553 -0400 checkout: moving from 58cda32c5e506246c098f444e1cb88a2ce1114b7 to master -2c5ce91606c5c91e624881189bb53eac13f4a025 2c5ce91606c5c91e624881189bb53eac13f4a025 Brycen G 1730228745 -0400 checkout: moving from master to HEAD -2c5ce91606c5c91e624881189bb53eac13f4a025 2e2d3ca9014413cf2673c81b65a84650b84335f6 Brycen G 1730228746 -0400 checkout: moving from 2c5ce91606c5c91e624881189bb53eac13f4a025 to refs/remotes/pull/5/merge -2e2d3ca9014413cf2673c81b65a84650b84335f6 699d0a438bf043bab2fb619569ad48c9be6de933 Brycen G 1730234628 -0400 checkout: moving from 2e2d3ca9014413cf2673c81b65a84650b84335f6 to master diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/heads/master /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/heads/master --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/heads/master 2024-10-29 20:43:48.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/heads/master 2024-10-29 19:02:32.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 699d0a438bf043bab2fb619569ad48c9be6de933 Brycen G 1730234628 -0400 branch: Created from refs/remotes/origin/master +0000000000000000000000000000000000000000 2c5ce91606c5c91e624881189bb53eac13f4a025 Brycen G 1730228553 -0400 branch: Created from refs/remotes/origin/master diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/origin/dep/fedora-42.x /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/dep/fedora-42.x --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/origin/dep/fedora-42.x 2024-10-29 19:05:46.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/dep/fedora-42.x 2024-10-29 19:02:32.000000000 +0000 @@ -2,3 +2,2 @@ b73d8f03f02a0380406ddb3aa4d458698f5b3892 ce5a0dab175c21f81afcb5244f9259515e62837d Brycen G 1730213866 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: forced-update ce5a0dab175c21f81afcb5244f9259515e62837d 14b62cbd28d25d09411c35ba85e4c643bf25a8c6 Brycen G 1730228553 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: forced-update -14b62cbd28d25d09411c35ba85e4c643bf25a8c6 305a2febd2f7a86258f353baa47743ed4c621839 Brycen G 1730228746 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* +2e2d3ca9014413cf2673c81b65a84650b84335f6:refs/remotes/pull/5/merge: forced-update diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/origin/feat/bsd-package /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/feat/bsd-package --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/origin/feat/bsd-package 2024-10-29 19:05:46.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/feat/bsd-package 2024-10-07 14:39:32.000000000 +0000 @@ -1,2 +1 @@ 0000000000000000000000000000000000000000 157074012eecdc6e49882c18051f644e353bdc3e romvnly 1728311973 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: storing head -157074012eecdc6e49882c18051f644e353bdc3e dbe14c00982b08eef49a2c94c173f6cebb6e0c39 Brycen G 1730228746 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* +2e2d3ca9014413cf2673c81b65a84650b84335f6:refs/remotes/pull/5/merge: fast-forward diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/origin/master /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/master --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/origin/master 2024-10-29 20:43:48.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/master 2024-10-29 19:02:32.000000000 +0000 @@ -107,3 +107,2 @@ a3967deaf00ed38c159e28716769c3e9ba1ca796 58cda32c5e506246c098f444e1cb88a2ce1114b7 Brycen G 1730213866 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: fast-forward 58cda32c5e506246c098f444e1cb88a2ce1114b7 2c5ce91606c5c91e624881189bb53eac13f4a025 Brycen G 1730228553 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: fast-forward -2c5ce91606c5c91e624881189bb53eac13f4a025 699d0a438bf043bab2fb619569ad48c9be6de933 Brycen G 1730234628 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: fast-forward Only in /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/pull: 5 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/heads/master /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/heads/master --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/heads/master 2024-10-29 20:43:48.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/heads/master 2024-10-29 19:02:32.000000000 +0000 @@ -1 +1 @@ -699d0a438bf043bab2fb619569ad48c9be6de933 +2c5ce91606c5c91e624881189bb53eac13f4a025 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/dep/fedora-42.x /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/dep/fedora-42.x --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/dep/fedora-42.x 2024-10-29 19:05:46.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/dep/fedora-42.x 2024-10-29 19:02:32.000000000 +0000 @@ -1 +1 @@ -305a2febd2f7a86258f353baa47743ed4c621839 +14b62cbd28d25d09411c35ba85e4c643bf25a8c6 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/feat/bsd-package /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/feat/bsd-package --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/feat/bsd-package 2024-10-29 19:05:46.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/feat/bsd-package 2024-10-07 14:39:32.000000000 +0000 @@ -1 +1 @@ -dbe14c00982b08eef49a2c94c173f6cebb6e0c39 +157074012eecdc6e49882c18051f644e353bdc3e diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/master /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/master --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/master 2024-10-29 20:43:48.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/master 2024-10-29 19:02:32.000000000 +0000 @@ -1 +1 @@ -699d0a438bf043bab2fb619569ad48c9be6de933 +2c5ce91606c5c91e624881189bb53eac13f4a025 Only in /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/pull: 5 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/Makefile /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/Makefile --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/Makefile 2024-10-29 20:43:48.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/Makefile 2024-10-29 19:02:32.000000000 +0000 @@ -15,21 +15,4 @@ BUILDTAGS := UNAME_S := $(shell uname -s) -# Determine the system architecture using various methods -ARCH := $(shell \ - if command -v rpm > /dev/null 2>&1; then \ - rpm -E '%{_arch}'; \ - elif command -v dpkg > /dev/null 2>&1; then \ - dpkg --print-architecture; \ - elif command -v apk > /dev/null 2>&1; then \ - apk --print-arch; \ - elif command -v uname > /dev/null 2>&1; then \ - uname -m; \ - elif command -v arch > /dev/null 2>&1; then \ - arch; \ - elif command -v lscpu > /dev/null 2>&1; then \ - lscpu | grep Architecture | awk '{print $$2}'; \ - else \ - echo "unknown"; \ - fi) @@ -79,7 +62,7 @@ TBLIBSDIR ?= $(TARBALLDIR)/libs -TAR_NAME ?= Rokon-$(UNAME_S)-$(VERSION)-$(ARCH).tar.gz +TAR_NAME ?= Rokon-$(shell uname)-$(VERSION)-$(shell uname -m).tar.gz # Unix* users know .run is for them. DO NOT include it in the filename! -RUNFILE_NAME ?= Rokon-$(VERSION)-$(ARCH).run +RUNFILE_NAME ?= Rokon-$(VERSION)-$(shell uname -m).run @@ -208,5 +191,5 @@ mv AppDir/usr/share/metainfo/io.github.brycensranch.Rokon.metainfo.xml AppDir/usr/share/metainfo/io.github.brycensranch.Rokon.appdata.xml cp ./AppDir/usr/share/icons/hicolor/256x256/apps/io.github.brycensranch.Rokon.png ./AppDir - VERSION=$(VERSION) APPIMAGELAUNCHER_DISABLE=1 mkappimage --comp zstd --ll -u "gh-releases-zsync|BrycensRanch|Rokon|latest|Rokon-*$(ARCH).AppImage.zsync" ./AppDir + VERSION=$(VERSION) APPIMAGELAUNCHER_DISABLE=1 mkappimage --comp zstd --ll -u "gh-releases-zsync|BrycensRanch|Rokon|latest|Rokon-*$(shell uname -m).AppImage.zsync" ./AppDir .PHONY: tarball @@ -221,5 +204,5 @@ cp -v ./windows/portable.txt $(TARBALLDIR) $(call copy_deps,$(TARBALLDIR)/bin/$(TARGET),$(TBLIBSDIR)) - # patchelf --set-interpreter libs/ld-linux-$(subst _,-,$(ARCH)).so.2 --force-rpath --set-rpath libs $(TARBALLDIR)/bin/$(TARGET) + # patchelf --set-interpreter libs/ld-linux-$(subst _,-,$(shell uname -m)).so.2 --force-rpath --set-rpath libs $(TARBALLDIR)/bin/$(TARGET) $(call make_wrapper_script,$(TARBALLDIR)) @if command -v glibc-downgrade > /dev/null; then \ @@ -260,5 +243,5 @@ tar -czf $(TAR_NAME) $(TARBALLDIR) @if command -v zsyncmake >/dev/null 2>&1; then \ - zsyncmake $(TAR_NAME) -u "gh-releases-zsync|BrycensRanch|Rokon|latest|Rokon-$(UNAME_S)-*-$(ARCH).tar.gz.zsync"; \ + zsyncmake $(TAR_NAME) -u "gh-releases-zsync|BrycensRanch|Rokon|latest|Rokon-$(shell uname)-*-$(shell uname -m).tar.gz.zsync"; \ else \ echo "zsyncmake not found. Please install it to generate the zsync file."; \ @@ -272,14 +255,13 @@ $(call print-target) $(MAKE) PACKAGED=true PACKAGEFORMAT="run" TBPKGFMT="run" TARBALLDIR=$(RUNDIR) NOTB=1 tarball - $(MAKESELF) --sha256 $(RUNDIR) Rokon-$(VERSION)-$(ARCH).run Rokon ./$(TARGET) - ./Rokon-$(VERSION)-$(ARCH).run -- "--version"; \ + $(MAKESELF) --sha256 $(RUNDIR) Rokon-$(VERSION)-$(uname -m).run Rokon ./$(TARGET) + LD_DEBUG=libs ./Rokon-$(VERSION)-$(uname -m).run -- "--version"; \ status=$$?; \ if [ $$status -ne 0 ]; then \ - echo "Seconary sanity check failed. See output above for details."; \ + echo "Sanity check failed. See output above for details."; \ exit $$status; \ else \ - echo "Seconary sanity check succeeded."; \ + echo "Sanity check succeeded."; \ fi - @echo "Cheers, the run file was successfully created. It is the file ./Rokon-$(VERSION)-$(ARCH).run 🚀" .PHONY: dev diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/PKGBUILD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/PKGBUILD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/PKGBUILD 2024-10-29 20:44:00.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/PKGBUILD 2024-10-29 19:02:48.000000000 +0000 @@ -2,5 +2,5 @@ pkgname=rokon -pkgver=1.0.0+699d0a4 +pkgver=1.0.0+2c5ce91 pkgrel=1 epoch=0 Binary files /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/run/bin/rokon and /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/run/bin/rokon differ