diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-04-07 12:43:55 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:37 -0700 |
| commit | d3286daf334d2678198d110e25eafb9717d14781 (patch) | |
| tree | 96e1b6d9b14839fdff29db9f21c927aa736d11bc /meta-oe | |
| parent | 8b3e126484d6790a3cbb6ece87554ed74b2860e0 (diff) | |
| download | meta-openembedded-contrib-d3286daf334d2678198d110e25eafb9717d14781.tar.gz | |
smstools3: refresh patches
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file scripts/sms3
Hunk #1 succeeded at 24 with fuzz 2.
plus more
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch | 35 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch | 18 |
2 files changed, 40 insertions, 13 deletions
diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch index f7529d8cb5..49b4d1ddac 100644 --- a/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch +++ b/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch @@ -1,29 +1,48 @@ ---- smstools3.orig/scripts/sendsms 2006-02-04 11:52:06.000000000 -0800 -+++ smstools3/scripts/sendsms 2017-12-30 15:40:28.009169106 -0800 +From 85602c3e531d39e89dc8cee0c4a592f85006a064 Mon Sep 17 00:00:00 2001 +From: Bill Randle <bill.randle@gmail.com> +Date: Sun, 31 Dec 2017 09:08:23 -0800 + +--- + scripts/sendsms | 2 +- + scripts/sms2html | 2 +- + scripts/sms2unicode | 2 +- + scripts/unicode2sms | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/scripts/sendsms b/scripts/sendsms +index 512026d..bb56856 100755 +--- a/scripts/sendsms ++++ b/scripts/sendsms @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This script send a text sms at the command line by creating # a sms file in the outgoing queue. ---- smstools3.orig/scripts/sms2html 2006-02-04 11:52:06.000000000 -0800 -+++ smstools3/scripts/sms2html 2017-12-30 15:39:17.496694390 -0800 +diff --git a/scripts/sms2html b/scripts/sms2html +index ff253e3..946185e 100755 +--- a/scripts/sms2html ++++ b/scripts/sms2html @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This script converts a received sms file into a html file. ---- smstools3.orig/scripts/sms2unicode 2006-02-04 11:52:06.000000000 -0800 -+++ smstools3/scripts/sms2unicode 2017-12-30 15:33:14.477250179 -0800 +diff --git a/scripts/sms2unicode b/scripts/sms2unicode +index 46e2756..2826dc1 100755 +--- a/scripts/sms2unicode ++++ b/scripts/sms2unicode @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This script converts a received sms file into a pure unicode text file. ---- smstools3/scripts/unicode2sms 2006-02-04 11:52:06.000000000 -0800 -+++ smstools3/scripts/unicode2sms.new 2017-12-30 15:33:56.918536044 -0800 +diff --git a/scripts/unicode2sms b/scripts/unicode2sms +index 2ae86dc..3fccf0d 100755 +--- a/scripts/unicode2sms ++++ b/scripts/unicode2sms @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch index 6220446327..e1d79d3327 100644 --- a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch +++ b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch @@ -1,8 +1,16 @@ -Index: smstools3/scripts/sms3 -=================================================================== ---- smstools3.orig/scripts/sms3 2010-05-04 11:21:44.000000000 +0200 -+++ smstools3/scripts/sms3 2015-02-22 20:05:51.615074469 +0100 -@@ -24,11 +24,11 @@ +From 9a4a872dca78ca9cb6bdc228be61f5a4c2d68b1f Mon Sep 17 00:00:00 2001 +From: Kai Ulrich <kaiu@gmx.de> +Date: Wed, 18 Mar 2015 11:20:53 +0100 + +--- + scripts/sms3 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/sms3 b/scripts/sms3 +index 6b990bf..09c063b 100755 +--- a/scripts/sms3 ++++ b/scripts/sms3 +@@ -24,9 +24,9 @@ INFOFILE="/var/run/smsd.working" # Logfile can also be defined in here: LOGFILE="/var/log/smsd.log" |