unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] gnu: dtc: Update to 1.4.2. Remove patches since they are integrated upstream now.
@ 2016-09-03 18:57 Danny Milosavljevic
  2016-09-04 11:03 ` David Craven
  0 siblings, 1 reply; 2+ messages in thread
From: Danny Milosavljevic @ 2016-09-03 18:57 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

---
 gnu/local.mk                                       |  1 -
 .../patches/dtc-add-missing-symbols-to-lds.patch   | 59 ----------------------
 gnu/packages/u-boot.scm                            |  6 +--
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-dtc-Update-to-1.4.2.-Remove-patches-since-they-a.patch --]
[-- Type: text/x-patch; name="0001-gnu-dtc-Update-to-1.4.2.-Remove-patches-since-they-a.patch", Size: 3520 bytes --]

diff --git a/gnu/local.mk b/gnu/local.mk
index efb00b9..8179920 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -483,7 +483,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/doc++-include-directives.patch		\
   %D%/packages/patches/doc++-segfault-fix.patch			\
   %D%/packages/patches/doxygen-test.patch			\
-  %D%/packages/patches/dtc-add-missing-symbols-to-lds.patch     \
   %D%/packages/patches/duplicity-piped-password.patch		\
   %D%/packages/patches/duplicity-test_selection-tmp.patch	\
   %D%/packages/patches/elfutils-tests-ptrace.patch		\
diff --git a/gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch b/gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch
deleted file mode 100644
index ccece0f..0000000
--- a/gnu/packages/patches/dtc-add-missing-symbols-to-lds.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a4b093f7366fdb429ca1781144d3985fa50d0fbb Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien.grall@linaro.org>
-Date: Tue, 17 Mar 2015 16:00:34 +0000
-Subject: [PATCH] libfdt: Add missing functions to shared library
-
-The commit 4e76ec7 "libfdt: Add fdt_next_subnode() to permit easy
-subnode iteration" adds new functions (fdt_{first,next}_subnode) but
-forgot to mark them as 'global' in the shared library.
-
-Signed-off-by: Julien Grall <julien.grall@linaro.org>
----
- libfdt/version.lds | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libfdt/version.lds b/libfdt/version.lds
-index 80b322b..941208e 100644
---- a/libfdt/version.lds
-+++ b/libfdt/version.lds
-@@ -54,6 +54,8 @@ LIBFDT_1.2 {
- 		fdt_get_property_by_offset;
- 		fdt_getprop_by_offset;
- 		fdt_next_property_offset;
-+		fdt_first_subnode;
-+		fdt_next_subnode;
- 
- 	local:
- 		*;
-From f58799be130e27cc729cb2d45566daa0bb3b8605 Mon Sep 17 00:00:00 2001
-From: David Gibson <david@gibson.dropbear.id.au>
-Date: Tue, 1 Dec 2015 12:55:21 +1100
-Subject: [PATCH] libfdt: Add some missing symbols to version.lds
-
-Several functions in the header file were missing from the version.lds
-script, meaning that they couldn't be used from a libfdt shared library.
-
-Reported by Ken Aaker, via github issue tracker.
-
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
----
- libfdt/version.lds | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libfdt/version.lds b/libfdt/version.lds
-index f19f157..1f4e1ea 100644
---- a/libfdt/version.lds
-+++ b/libfdt/version.lds
-@@ -57,6 +57,10 @@ LIBFDT_1.2 {
- 		fdt_next_property_offset;
- 		fdt_first_subnode;
- 		fdt_next_subnode;
-+		fdt_address_cells;
-+		fdt_size_cells;
-+		fdt_stringlist_contains;
-+		fdt_resize;
- 
- 	local:
- 		*;
--- 
-2.8.1
diff --git a/gnu/packages/u-boot.scm b/gnu/packages/u-boot.scm
index 15b24a6..e9a4b90 100644
--- a/gnu/packages/u-boot.scm
+++ b/gnu/packages/u-boot.scm
@@ -32,7 +32,7 @@
 (define-public dtc
   (package
     (name "dtc")
-    (version "1.4.1")
+    (version "1.4.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -40,9 +40,7 @@
                     "dtc-" version ".tar.xz"))
               (sha256
                (base32
-                "155v52palf5fwfcnq696s41whjk0a5dqx98b7maqzdn7xbc2m6bp"))
-              (patches
-                (search-patches "dtc-add-missing-symbols-to-lds.patch"))))
+                "1b7si8niyca4wxbfah3qw4p4wli81mc1qwfhaswvrfqahklnwi8k"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("bison" ,bison)

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] gnu: dtc: Update to 1.4.2. Remove patches since they are integrated upstream now.
  2016-09-03 18:57 [PATCH] gnu: dtc: Update to 1.4.2. Remove patches since they are integrated upstream now Danny Milosavljevic
@ 2016-09-04 11:03 ` David Craven
  0 siblings, 0 replies; 2+ messages in thread
From: David Craven @ 2016-09-04 11:03 UTC (permalink / raw)
  To: Danny Milosavljevic; +Cc: guix-devel

Thanks! Pushed as 8cfdd64c3797bd014ad742bd4bd994d647ced985.

P.S. Can you create your patches with git format-patch in the future?
That saves reviewers some time, so that they don't have to retype the
commit message and find your author line and change the author of the
commit ;)

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-09-04 11:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-03 18:57 [PATCH] gnu: dtc: Update to 1.4.2. Remove patches since they are integrated upstream now Danny Milosavljevic
2016-09-04 11:03 ` David Craven

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).