Drop already applied patches

PATCH New Paul Eggleton 1 participant 3 messages Mar 16, 2015

Share & tools

Paul Eggleton

author

2015-03-16 14:27 UTC #0 lore raw

cover Drop already applied patches

Drop some patches that were already applied upstream (quilt doesn't complain about these, but devtool's attempted use of git/patch to apply them will and we really should have dropped them on upgrade).

The following changes since commit fb29441216435b9bae47ca9cd42db5a6b1fe77d8:

oeqa/parselogs: Skip hda opcode errors (2015-03-12 12:49:22 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/oldpatches
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/oldpatches

Paul Eggleton (2):
opkg: drop already applied patch
xf86-input-synaptics: drop already applied patch

 ...g_remove.c-avoid-remove-pkg-repeatly-with.patch | 39 --------------
 meta/recipes-devtools/opkg/opkg_0.2.4.bb           |  1 -
 .../always_include_xorg_server.h.patch             | 60 ----------------------
 .../xorg-driver/xf86-input-synaptics_1.8.1.bb      |  4 --
 4 files changed, 104 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch

Signature · 1 line

1.9.3

Paul Eggleton

author

2015-03-16 14:27 UTC #1 lore raw

PATCH 1/2 opkg: drop already applied patch

This patch was part of the 0.2.4 release.

Signed-off-by Paul Eggleton <[email protected]>

---
 ...g_remove.c-avoid-remove-pkg-repeatly-with.patch | 39 ----------------------
 meta/recipes-devtools/opkg/opkg_0.2.4.bb           |  1 -
 2 files changed, 40 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch

meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch deleted +0 ~~-39~~

deleted file mode 100644
index 5e5eafc..0000000
@@ -1,39 +0,0 @@
-From 41425d67d3589b1912416a17f740d6407c7834f2 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Wed, 8 Oct 2014 19:53:13 +0800
-Subject: [PATCH] libopkg/opkg_remove.c: avoid remove pkg repeatly with option
- --force-removal-of-dependent-packages
-
-While remove pkg with '--force-removal-of-dependent-packages',
-pkg may be added to pkgs remove list multiple times, add status
-check to make sure pkg only be removed once.
-
-Upstream-Status: Backport
-Signed-off-by: Hongxu Jia <[email protected]>
-
----
- libopkg/opkg_remove.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c
-index 34f9154..a225e41 100644
---- a/libopkg/opkg_remove.c
-+++ b/libopkg/opkg_remove.c
-@@ -250,6 +250,14 @@ opkg_remove_pkg(pkg_t *pkg, int from_upgrade)
-      if ((parent_pkg = pkg->parent) == NULL)
- 	  return 0;
- 
-+     /* While remove pkg with '--force-removal-of-dependent-packages',
-+        pkg may be added to remove list multiple times, add status
-+        check to make sure pkg only be removed once. */
-+     if (conf->force_removal_of_dependent_packages &&
-+             pkg->state_flag & SF_FILELIST_CHANGED &&
-+             pkg->state_status == SS_NOT_INSTALLED)
-+         return 0;
-+
-      /* only attempt to remove dependent installed packages if
-       * force_depends is not specified or the package is being
-       * replaced.
--- 
-1.9.1
-

meta/recipes-devtools/opkg/opkg_0.2.4.bb +0 -1

index 447f3f6..23a32e6 100644
@@ -12,7 +12,6 @@ PE = "1"
 SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
            file://no-install-recommends.patch \
            file://add-exclude.patch \
-           file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \
            file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \
            file://opkg-configure.service \
            file://opkg.conf \

Signature · 1 line

1.9.3

Paul Eggleton

author

2015-03-16 14:27 UTC #2 lore raw

PATCH 2/2 xf86-input-synaptics: drop already applied patch

In reply to Paul Eggleton

This patch was part of the 1.8.1 release.

Signed-off-by Paul Eggleton <[email protected]>

---
 .../always_include_xorg_server.h.patch             | 60 ----------------------
 .../xorg-driver/xf86-input-synaptics_1.8.1.bb      |  4 --
 2 files changed, 64 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch

meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch deleted +0 ~~-60~~

deleted file mode 100644
index f36bb75..0000000
@@ -1,60 +0,0 @@
-From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[email protected]>
-Date: Fri, 29 Aug 2014 07:57:41 +1000
-Subject: Include xorg-server.h to fix build errors on newest glibc
-
-In file included from /usr/include/string.h:634:0,
-                 from /usr/include/xorg/os.h:53,
-                 from /usr/include/xorg/misc.h:115,
-                 from /usr/include/xorg/xf86str.h:37,
-                 from /usr/include/xorg/xf86Xinput.h:54,
-                 from synproto.h:36,
-                 from synproto.c:24:
-/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
- strndup(const char *str, size_t n);
-
-See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html
-
-Signed-off-by: Peter Hutterer <[email protected]>
-
-Status: Backport
-
-Index: xf86-input-synaptics-1.8.0/src/eventcomm.h
-===================================================================
---- xf86-input-synaptics-1.8.0.orig/src/eventcomm.h	2014-08-28 18:40:28.628070587 -0700
-+++ xf86-input-synaptics-1.8.0/src/eventcomm.h	2014-08-28 18:40:28.620070587 -0700
-@@ -27,6 +27,8 @@
- #ifndef _EVENTCOMM_H_
- #define _EVENTCOMM_H_
- 
-+#include <xorg-server.h>
-+
- #include <linux/input.h>
- #include <linux/version.h>
- #include <xf86Xinput.h>
-Index: xf86-input-synaptics-1.8.0/src/ps2comm.h
-===================================================================
---- xf86-input-synaptics-1.8.0.orig/src/ps2comm.h	2014-08-28 18:40:28.628070587 -0700
-+++ xf86-input-synaptics-1.8.0/src/ps2comm.h	2014-08-28 18:40:28.620070587 -0700
-@@ -22,6 +22,8 @@
- #ifndef _PS2COMM_H_
- #define _PS2COMM_H_
- 
-+#include <xorg-server.h>
-+
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include "xf86_OSproc.h"
-Index: xf86-input-synaptics-1.8.0/src/synproto.h
-===================================================================
---- xf86-input-synaptics-1.8.0.orig/src/synproto.h	2014-08-28 18:40:28.628070587 -0700
-+++ xf86-input-synaptics-1.8.0/src/synproto.h	2014-08-28 18:40:28.624070587 -0700
-@@ -31,6 +31,8 @@
- #include "config.h"
- #endif
- 
-+#include <xorg-server.h>
-+
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <xf86Xinput.h>

meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb +0 -4

index 435faa6..19be77a 100644
@@ -1,7 +1,5 @@
 require xorg-driver-input.inc
 
-#SRC_URI += "file://configurefix.patch"
-
 SUMMARY = "X.Org X server -- synaptics touchpad input driver"
 
 DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \

@@ -12,8 +10,6 @@ advanced features of the touchpad to become available."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398"
 
-SRC_URI += "file://always_include_xorg_server.h.patch"
-
 SRC_URI[md5sum] = "ed70d0cba94262a4008dcef654ab34a9"
 SRC_URI[sha256sum] = "d74fdaf29e9888a2cb494e16d0a9ddb24265c5c765b05392b69c50e84ffbf09a"

Signature · 1 line

1.9.3