mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge pull request #6884 from heitbaum/rsync326
rsync: update to 3.2.6 and drop upstreamed patch
This commit is contained in:
commit
ade499c91a
@ -2,8 +2,8 @@
|
|||||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="rsync"
|
PKG_NAME="rsync"
|
||||||
PKG_VERSION="3.2.5"
|
PKG_VERSION="3.2.6"
|
||||||
PKG_SHA256="2ac4d21635cdf791867bc377c35ca6dda7f50d919a58be45057fd51600c69aba"
|
PKG_SHA256="fb3365bab27837d41feaf42e967c57bd3a47bc8f10765a3671efd6a3835454d3"
|
||||||
PKG_LICENSE="GPLv3"
|
PKG_LICENSE="GPLv3"
|
||||||
PKG_SITE="https://rsync.samba.org"
|
PKG_SITE="https://rsync.samba.org"
|
||||||
PKG_URL="https://download.samba.org/pub/rsync/src/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
PKG_URL="https://download.samba.org/pub/rsync/src/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
From 68b1ce1dc3605a8b79594ba5e8e29577ea6dc42c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Wayne Davison <wayne@opencoder.net>
|
|
||||||
Date: Mon, 15 Aug 2022 21:52:13 -0700
|
|
||||||
Subject: [PATCH] Only run git describe if .git exists in the $srcdir.
|
|
||||||
|
|
||||||
---
|
|
||||||
mkgitver | 5 ++++-
|
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/mkgitver b/mkgitver
|
|
||||||
index 49aa150b..43156c65 100755
|
|
||||||
--- a/mkgitver
|
|
||||||
+++ b/mkgitver
|
|
||||||
@@ -1,7 +1,10 @@
|
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
srcdir=`dirname $0`
|
|
||||||
-gitver=`git describe --abbrev=8 2>/dev/null`
|
|
||||||
+
|
|
||||||
+if [ -e "$srcdir/.git" ]; then
|
|
||||||
+ gitver=`git describe --abbrev=8 2>/dev/null`
|
|
||||||
+fi
|
|
||||||
|
|
||||||
if [ ! -f git-version.h ]; then
|
|
||||||
touch git-version.h
|
|
Loading…
x
Reference in New Issue
Block a user