Re: [meta-oe][PATCH] smstools3: update to 3.1.21; drop uneeded patches

[akuster808 <akuster808@gmail.com>]

On 12/23/2017 12:04 PM, Bill Randle wrote:
> Update smstools3 to latest version and drop some patches that no longer
> seem to be required. (Builds and runs fine on poky.)
>
> Signed-off-by: Bill Randle <bill.randle@gmail.com>
> ---
>  .../smstools3/fix-makefile-override.patch          | 24 ----------------------
>  ...s_binpath_and_psops.patch => sms_binpath.patch} |  5 +----
>  .../{smstools3_3.1.15.bb => smstools3_3.1.21.bb}   |  8 +++-----
>  3 files changed, 4 insertions(+), 33 deletions(-)
>  delete mode 100644 meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch
>  rename meta-oe/recipes-connectivity/smstools3/smstools3/{sms_binpath_and_psops.patch => sms_binpath.patch} (90%)
>  rename meta-oe/recipes-connectivity/smstools3/{smstools3_3.1.15.bb => smstools3_3.1.21.bb} (84%)
>
> diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch
> deleted file mode 100644
> index f0a1d33c9..000000000
> --- a/meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -Upstream-Status: Backport [debian]
> -
> ---- a/src/Makefile
> -+++ b/src/Makefile
> -@@ -37,16 +37,15 @@
> - # Use the following only on GNU/Linux and only if you need ps listing like "smsd: MAINPROCESS" and "smsd: GSM1"
> - # CFLAGS += -D USE_LINUX_PS_TRICK
> - 
> --all: smsd 
> --
> --smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o
> --
> - ifneq (,$(findstring SOLARIS,$(CFLAGS)))
> - ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS)))
> - override LFLAGS += -lsocket -lnsl
> - endif
> - endif
> - 
> -+all: smsd 
> -+
> -+smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o
> - ifneq (,$(findstring NOSTATS,$(CFLAGS)))
> - 	$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS)
> - else 
> diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath_and_psops.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch
> similarity index 90%
> rename from meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath_and_psops.patch
> rename to meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch
> index ffcaa0971..622044632 100644
> --- a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath_and_psops.patch
> +++ b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch
> @@ -12,8 +12,5 @@ Index: smstools3/scripts/sms3
>  -RESETMODEMS=/usr/local/bin/smsd_resetmodems
>  +RESETMODEMS=/usr/bin/smsd_resetmodems
>   NAME=smsd
> --PSOPT="-e"
> -+PSOPT=""
> + PSOPT="-e"
>   ECHO=echo
> - case `uname` in
> -   *BSD|Darwin)
> diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb
> similarity index 84%
> rename from meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
> rename to meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb
> index 310a13c22..9885f351b 100644
> --- a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
> +++ b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb
> @@ -6,18 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4d21efa1bb2a186360dde4035f860682"
>  HOMEPAGE = "http://smstools3.kekekasvi.com"
>  
>  SRC_URI = "http://smstools3.kekekasvi.com/packages/${BP}.tar.gz \
> -           file://sms_binpath_and_psops.patch \
> -           file://fix-makefile-override.patch"
> +           file://sms_binpath.patch"
>  
> -SRC_URI[md5sum] = "0241ef60e646fac1a06254a848e61ed7"
> -SRC_URI[sha256sum] = "ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59"
> +SRC_URI[md5sum] = "6a9f038fb38a49cc3a4f8f14a88fb8af"
> +SRC_URI[sha256sum] = "a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e49"
sha256sum is incorrect. it should be
"a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084". I
will fix it locally

- armin

>  
>  
>  S = "${WORKDIR}/${BPN}"
>  
>  EXTRA_OEMAKE += "LFLAGS='${LDFLAGS}'"
>  
> -RDEPENDS_${PN} = "bash"
>  INITSCRIPT_NAME = "sms3"
>  INITSCRIPT_PARAMS = "defaults"
>