Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2 1/1] package/tvheadend: bump version
@ 2019-07-02 18:58 Bernd Kuhls
  2019-07-04  5:56 ` Peter Korsgaard
  0 siblings, 1 reply; 5+ messages in thread
From: Bernd Kuhls @ 2019-07-02 18:58 UTC (permalink / raw)
  To: buildroot

Removed patch which was applied upstream.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: bumped version after patch from v1 was committed upstream

 ...pie-linking-according-to-disable-pie.patch | 34 -------------------
 package/tvheadend/tvheadend.hash              |  2 +-
 package/tvheadend/tvheadend.mk                |  2 +-
 3 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch

diff --git a/package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch b/package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch
deleted file mode 100644
index 385c94b36b..0000000000
--- a/package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5cbf08213222cb507d365e6cbda87277f0b8f31e Mon Sep 17 00:00:00 2001
-From: Giulio Benetti <giulio.benetti@micronovasrl.com>
-Date: Fri, 14 Jun 2019 14:25:08 +0200
-Subject: [PATCH] Makefile: fix -pie linking according to --disable-pie
-
-Only compilation follows './configure --disable-pie', linking instead
-doesn't, because '-pie' flag is passed to LDFLAGS uncoditionally.
-
-So add '-pie' flag only if CONFIG_PIE=yes.
-
-Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
----
- Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 41783b546..4e5a947a3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -62,7 +62,10 @@ LDFLAGS += -ldl -lm
- else
- LDFLAGS += -ldl -lpthread -lm
- endif
--LDFLAGS += -pie -Wl,-z,now
-+ifeq ($(CONFIG_PIE),yes)
-+LDFLAGS += -pie
-+endif
-+LDFLAGS += -Wl,-z,now
- ifeq ($(CONFIG_LIBICONV),yes)
- LDFLAGS += -liconv
- endif
--- 
-2.17.1
-
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 43178b874a..ea24aec1cb 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 92c5f2cdda085b81fc50025afeb3ece74f60fae2b26f40a7dd07e227b0db2d9f  tvheadend-17dff3e5ffbd67174b6c0d7b49f5488e19ec1ead.tar.gz
+sha256 6a7703fbbe553a2d9f87acafc01162d81f78c6e427b8ab9c83242e1677248582  tvheadend-8f1de1621d78c91431238176bf4f6290870a031a.tar.gz
 sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index b192a33d4a..61732a203c 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 17dff3e5ffbd67174b6c0d7b49f5488e19ec1ead
+TVHEADEND_VERSION = 8f1de1621d78c91431238176bf4f6290870a031a
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 1/1] package/tvheadend: bump version
  2019-07-02 18:58 Bernd Kuhls
@ 2019-07-04  5:56 ` Peter Korsgaard
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2019-07-04  5:56 UTC (permalink / raw)
  To: buildroot

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Removed patch which was applied upstream.
 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 > ---
 > v2: bumped version after patch from v1 was committed upstream

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 1/1] package/tvheadend: bump version
@ 2021-12-11 22:35 Bernd Kuhls
  2021-12-12 15:11 ` Arnout Vandecappelle
  0 siblings, 1 reply; 5+ messages in thread
From: Bernd Kuhls @ 2021-12-11 22:35 UTC (permalink / raw)
  To: buildroot; +Cc: Yann E . MORIN

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: fixed patch to apply on master branch (Arnout)

 package/tvheadend/tvheadend.hash | 2 +-
 package/tvheadend/tvheadend.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index 1c896df140..db06af53b7 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  fc734c36c98aa1535172621c3b6fcac9f1d253f850abc50d01b771937bfd2a76  tvheadend-dbaa0f850394af8ab845df802f5f781ac0218ec4.tar.gz
+sha256  11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad  tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz
 sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 3c1764c478..27443307da 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = dbaa0f850394af8ab845df802f5f781ac0218ec4
+TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] package/tvheadend: bump version
  2021-12-11 22:35 [Buildroot] [PATCH v2 1/1] package/tvheadend: bump version Bernd Kuhls
@ 2021-12-12 15:11 ` Arnout Vandecappelle
  2021-12-12 15:56   ` Yann E. MORIN
  0 siblings, 1 reply; 5+ messages in thread
From: Arnout Vandecappelle @ 2021-12-12 15:11 UTC (permalink / raw)
  To: Bernd Kuhls, buildroot; +Cc: Yann E . MORIN



On 11/12/2021 23:35, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
> v2: fixed patch to apply on master branch (Arnout)
> 
>   package/tvheadend/tvheadend.hash | 2 +-
>   package/tvheadend/tvheadend.mk   | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
> index 1c896df140..db06af53b7 100644
> --- a/package/tvheadend/tvheadend.hash
> +++ b/package/tvheadend/tvheadend.hash
> @@ -1,3 +1,3 @@
>   # Locally computed
> -sha256  fc734c36c98aa1535172621c3b6fcac9f1d253f850abc50d01b771937bfd2a76  tvheadend-dbaa0f850394af8ab845df802f5f781ac0218ec4.tar.gz
> +sha256  11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad  tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz
>   sha256  54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
> diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
> index 3c1764c478..27443307da 100644
> --- a/package/tvheadend/tvheadend.mk
> +++ b/package/tvheadend/tvheadend.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -TVHEADEND_VERSION = dbaa0f850394af8ab845df802f5f781ac0218ec4
> +TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6
>   TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
>   TVHEADEND_LICENSE = GPL-3.0+
>   TVHEADEND_LICENSE_FILES = LICENSE.md
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] package/tvheadend: bump version
  2021-12-12 15:11 ` Arnout Vandecappelle
@ 2021-12-12 15:56   ` Yann E. MORIN
  0 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2021-12-12 15:56 UTC (permalink / raw)
  To: Arnout Vandecappelle; +Cc: Bernd Kuhls, buildroot

Bernd, All,

On 2021-12-12 16:11 +0100, Arnout Vandecappelle spake thusly:
> On 11/12/2021 23:35, Bernd Kuhls wrote:
> >Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
>  Applied to master, thanks.

Arnout and I stepped on each other's toe when applying, and Arnout ran
away before he got the opportunity to push the patches he applied. So I
did.

Applied to master, thanks.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-12-12 15:57 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-11 22:35 [Buildroot] [PATCH v2 1/1] package/tvheadend: bump version Bernd Kuhls
2021-12-12 15:11 ` Arnout Vandecappelle
2021-12-12 15:56   ` Yann E. MORIN
  -- strict thread matches above, loose matches on Subject: below --
2019-07-02 18:58 Bernd Kuhls
2019-07-04  5:56 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox