[oe,meta-oe,12/16] picocom: Upgrade to 2.2

Message ID 20170320053152.29352-12-raj.khem@gmail.com
State New
Headers show
Series
  • Untitled series #783
Related show

Commit Message

Khem Raj March 20, 2017, 5:31 a.m.
Package has moved to github
License file got some cosmetic changes see
https://github.com/npat-efault/picocom/commit/13fd331d410c2e8c39fa041bd54c3b0a93df64e1

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb | 22 ++++++++++++++++++++++
 meta-oe/recipes-support/picocom/picocom_1.7.bb    | 19 -------------------
 meta-oe/recipes-support/picocom/picocom_git.bb    | 23 +++++++++++++++++++++++
 3 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb
 delete mode 100644 meta-oe/recipes-support/picocom/picocom_1.7.bb
 create mode 100644 meta-oe/recipes-support/picocom/picocom_git.bb

-- 
2.12.0

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Martin Jansa March 30, 2017, 9:45 a.m. | #1
On Sun, Mar 19, 2017 at 10:31:48PM -0700, Khem Raj wrote:
> Package has moved to github

> License file got some cosmetic changes see

> https://github.com/npat-efault/picocom/commit/13fd331d410c2e8c39fa041bd54c3b0a93df64e1

> 

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>  meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb | 22 ++++++++++++++++++++++


lcdproc doesn't belong here

>  meta-oe/recipes-support/picocom/picocom_1.7.bb    | 19 -------------------

>  meta-oe/recipes-support/picocom/picocom_git.bb    | 23 +++++++++++++++++++++++

>  3 files changed, 45 insertions(+), 19 deletions(-)

>  create mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb

>  delete mode 100644 meta-oe/recipes-support/picocom/picocom_1.7.bb

>  create mode 100644 meta-oe/recipes-support/picocom/picocom_git.bb

> 

> diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb

> new file mode 100644

> index 000000000..96fbd350b

> --- /dev/null

> +++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb

> @@ -0,0 +1,22 @@

> +require lcdproc5.inc

> +SRC_URI[md5sum] = "2f8e064233ef1d03e98c0b426595750d"

> +SRC_URI[sha256sum] = "843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804"

> +

> +PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"

> +PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid"

> +PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng"

> +

> +LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}"

> +

> +do_install_append () {

> +    # binaries

> +    install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc

> +

> +    # configuration files

> +    install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf

> +}

> +

> +PACKAGES =+ "lcdvc"

> +CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf"

> +FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc"

> +

> diff --git a/meta-oe/recipes-support/picocom/picocom_1.7.bb b/meta-oe/recipes-support/picocom/picocom_1.7.bb

> deleted file mode 100644

> index d2a76c0a9..000000000

> --- a/meta-oe/recipes-support/picocom/picocom_1.7.bb

> +++ /dev/null

> @@ -1,19 +0,0 @@

> -SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"

> -SECTION = "console/utils"

> -LICENSE = "GPLv2+"

> -HOMEPAGE = "http://code.google.com/p/picocom/"

> -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=393a5ca445f6965873eca0259a17f833"

> -

> -SRC_URI = "http://picocom.googlecode.com/files/picocom-${PV}.tar.gz"

> -

> -SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef"

> -SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9a2348c89e02a84935517002b3bc2c1129e"

> -

> -EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \

> -		'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "

> -

> -do_install () {

> -    install -d ${D}${bindir}

> -    install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/

> -}

> -

> diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb

> new file mode 100644

> index 000000000..e091094cf

> --- /dev/null

> +++ b/meta-oe/recipes-support/picocom/picocom_git.bb

> @@ -0,0 +1,23 @@

> +SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"

> +SECTION = "console/utils"

> +LICENSE = "GPLv2+"

> +HOMEPAGE = "http://code.google.com/p/picocom/"

> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a"

> +

> +BASEPV = "2.2"

> +PV = "${BASEPV}+git${SRCPV}"

> +

> +SRCREV = "deffd18c24145bd6f965f44e735a50b65810ccdc"

> +

> +SRC_URI = "git://github.com/npat-efault/picocom"

> +

> +S = "${WORKDIR}/git"

> +

> +EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \

> +		'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "

> +

> +do_install () {

> +    install -d ${D}${bindir}

> +    install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/

> +}

> +

> -- 

> 2.12.0

> 

> -- 

> _______________________________________________

> Openembedded-devel mailing list

> Openembedded-devel@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Khem Raj March 30, 2017, 4:37 p.m. | #2
On 3/30/17 2:45 AM, Martin Jansa wrote:
> On Sun, Mar 19, 2017 at 10:31:48PM -0700, Khem Raj wrote:

>> Package has moved to github

>> License file got some cosmetic changes see

>> https://github.com/npat-efault/picocom/commit/13fd331d410c2e8c39fa041bd54c3b0a93df64e1

>>

>> Signed-off-by: Khem Raj <raj.khem@gmail.com>

>> ---

>>  meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb | 22 ++++++++++++++++++++++

> 

> lcdproc doesn't belong here


Squash gone wrong. Drop it for now, coming in new pull.
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb
new file mode 100644
index 000000000..96fbd350b
--- /dev/null
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb
@@ -0,0 +1,22 @@ 
+require lcdproc5.inc
+SRC_URI[md5sum] = "2f8e064233ef1d03e98c0b426595750d"
+SRC_URI[sha256sum] = "843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804"
+
+PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"
+PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid"
+PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng"
+
+LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}"
+
+do_install_append () {
+    # binaries
+    install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
+
+    # configuration files
+    install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
+}
+
+PACKAGES =+ "lcdvc"
+CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf"
+FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc"
+
diff --git a/meta-oe/recipes-support/picocom/picocom_1.7.bb b/meta-oe/recipes-support/picocom/picocom_1.7.bb
deleted file mode 100644
index d2a76c0a9..000000000
--- a/meta-oe/recipes-support/picocom/picocom_1.7.bb
+++ /dev/null
@@ -1,19 +0,0 @@ 
-SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"
-SECTION = "console/utils"
-LICENSE = "GPLv2+"
-HOMEPAGE = "http://code.google.com/p/picocom/"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI = "http://picocom.googlecode.com/files/picocom-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef"
-SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9a2348c89e02a84935517002b3bc2c1129e"
-
-EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \
-		'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
-
-do_install () {
-    install -d ${D}${bindir}
-    install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/
-}
-
diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb
new file mode 100644
index 000000000..e091094cf
--- /dev/null
+++ b/meta-oe/recipes-support/picocom/picocom_git.bb
@@ -0,0 +1,23 @@ 
+SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"
+SECTION = "console/utils"
+LICENSE = "GPLv2+"
+HOMEPAGE = "http://code.google.com/p/picocom/"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a"
+
+BASEPV = "2.2"
+PV = "${BASEPV}+git${SRCPV}"
+
+SRCREV = "deffd18c24145bd6f965f44e735a50b65810ccdc"
+
+SRC_URI = "git://github.com/npat-efault/picocom"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \
+		'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
+
+do_install () {
+    install -d ${D}${bindir}
+    install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/
+}
+