Patchwork opkg: Bump SRCREV as patch has been applied upstream

login
register
mail settings
Submitter Paul Barker
Date July 29, 2013, 7:28 a.m.
Message ID <1375082912-22426-1-git-send-email-paul@paulbarker.me.uk>
Download mbox | patch
Permalink /patch/54667/
State Accepted
Commit e14df11795a03da4bb36f5172edbf9ca7e8ba681
Headers show

Comments

Paul Barker - July 29, 2013, 7:28 a.m.
The previous patch to fix the installation of libopkg headers has been accepted
upstream and is the next commit after the SRCREV used by the opkg recipe.
Therefore the patch can be replaced by a simple update of the SRCREV.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 .../0001-Fix-libopkg-header-installation.patch     | 32 ----------------------
 meta/recipes-devtools/opkg/opkg_svn.bb             |  3 +-
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/0001-Fix-libopkg-header-installation.patch

Patch

diff --git a/meta/recipes-devtools/opkg/opkg/0001-Fix-libopkg-header-installation.patch b/meta/recipes-devtools/opkg/opkg/0001-Fix-libopkg-header-installation.patch
deleted file mode 100644
index 784c412..0000000
--- a/meta/recipes-devtools/opkg/opkg/0001-Fix-libopkg-header-installation.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From 79a40cc4c3b5d6f8a90d9dc0ac5d2c40983764f7 Mon Sep 17 00:00:00 2001
-From: Paul Barker <paul@paulbarker.me.uk>
-Date: Sun, 16 Jun 2013 23:27:27 +0100
-Subject: [PATCH] Fix libopkg header installation.
-
-When opkg is built outside the source directory, libopkg headers aren't all
-installed as the search path for headers only includes the directory that make
-is being ran in, not the source directory. So we fix this by adding
-$(srcdir)/*.h to the list of header files to install.
-
-Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
-Upstream-Status: Submitted
----
- libopkg/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am
-index 043c5c4..b6f4f7b 100644
---- a/libopkg/Makefile.am
-+++ b/libopkg/Makefile.am
-@@ -2,7 +2,7 @@
- AM_CFLAGS=-Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DOPKGETCDIR=\"@opkgetcdir@\" -DOPKGLOCKFILE=\"@opkglockfile@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS) $(PATHFINDER_CFLAGS)
- 
- libopkg_includedir=$(includedir)/libopkg
--libopkg_include_HEADERS= *.h
-+libopkg_include_HEADERS= *.h $(srcdir)/*.h
- 
- 
- opkg_libcore_sources = \
--- 
-1.8.3
-
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 9f3512d..3a47b95 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -2,12 +2,11 @@  require opkg.inc
 
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
            file://obsolete_automake_macros.patch \
-	   file://0001-Fix-libopkg-header-installation.patch \
 "
 
 S = "${WORKDIR}/trunk"
 
-SRCREV = "649"
+SRCREV = "650"
 PV = "0.1.8+svnr${SRCPV}"
 
 PR = "${INC_PR}.0"