smstools3: update to 3.1.21; drop uneeded patches

PATCH In review Bill Randle 2 participants 2 messages Dec 23, 2017 – Dec 27, 2017

Share & tools

Bill Randle

author

2017-12-23 20:05 UTC #0 lore raw

PATCH 1/1 smstools3: update to 3.1.21; drop uneeded patches

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 <[email protected]>

---
 .../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%)

meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch deleted +0 ~~-24~~

deleted file mode 100644
index f0a1d33c9..000000000
@@ -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

meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch renamed from meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath_and_psops.patch +1 -4

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
@@ -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)

meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb renamed from meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb +3 -5

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
@@ -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"
 
 
 S = "${WORKDIR}/${BPN}"
 
 EXTRA_OEMAKE += "LFLAGS='${LDFLAGS}'"
 
-RDEPENDS_${PN} = "bash"
 INITSCRIPT_NAME = "sms3"
 INITSCRIPT_PARAMS = "defaults"

Signature · 1 line

2.13.6

akuster808

2017-12-27 17:22 UTC #1 lore raw

Quoted 69 lines · Bill Randle

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 <[email protected]>

---
 .../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%)

meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch deleted +0 ~~-24~~

deleted file mode 100644
index f0a1d33c9..000000000
@@ -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

meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch renamed from meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath_and_psops.patch +1 -4

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
@@ -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)

meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb renamed from meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb +0 -0

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
@@ -6,18 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4d21efa1bb2a186360dde4035f860682"
 HOMEPAGE = "http://smstools3.kekekasvi.com"

meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=4d21efa1bb2a186360dde4035f860682" · line 12

Quoted 10 lines

meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb renamed from meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb +3 -4

 
 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

Quoted 10 lines

meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb renamed from meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb +0 -1
 S = "${WORKDIR}/${BPN}"
 
 EXTRA_OEMAKE += "LFLAGS='${LDFLAGS}'"
 
-RDEPENDS_${PN} = "bash"
 INITSCRIPT_NAME = "sms3"
 INITSCRIPT_PARAMS = "defaults"
 