Skip to contentSkip to conversation

Import ckermit recipe

PATCH Superseded Anders Darander 2 participants 6 messages Aug 16, 2011

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover Import ckermit recipe

Ckermit is useful, not least as an alternative to lrzsz for serial port file-transfer (it has been a lot more robust in a number of cases).

This patch series imports the ckermit recipe from oe-dev. Thereafter, ckermit gets updated to the latest version, which also has the licensed change to BSD 3-clause.

The following changes since commit 4edc680bfd93f9358f099e1513f916c46347f538:

libx11: skip self if x11 not in DISTRO_FEATURES (2011-08-16 10:03:11 +0200)

are available in the git repository at:
git://github.com/darander/meta-oe ckermit
https://github.com/darander/meta-oe/tree/ckermit

Anders Darander (2):
ckermit: import from OE rev 84812c64e7146d75004b3eeecae22b6d1118c1fb
ckermit: update to version 9.0

 meta-oe/recipes-support/ckermit/ckermit_301.bb |   58 ++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/ckermit/ckermit_301.bb
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/2 ckermit: import from OE rev 84812c64e7146d75004b3eeecae22b6d1118c1fb

Adding LIC_FILES_CHKSUM, otherwise it is identical to the oe version.

---
 meta-oe/recipes-support/ckermit/ckermit_211.bb |   98 ++++++++++++++++++++++++
 1 files changed, 98 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/ckermit/ckermit_211.bb
meta-oe/recipes-support/ckermit/ckermit_211.bb new file +98 -0
new file mode 100644
index 0000000..86330d3
@@ -0,0 +1,98 @@
+DESCRIPTION = "C-Kermit is a combined serial and network communication \
+software package offering a consistent, medium-independent, \
+cross-platform approach to connection establishment, terminal \
+sessions, file transfer, character-set translation, and automation \
+of communication tasks."
+LICENSE = "Kermit"
+LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=17dabbd2543933464b6d32083c3a3596"
+HOMEPAGE = "http://www.columbia.edu/kermit/"
+SECTION = "console/network"
+SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV}"
+PR = "r3"
+
+#
+# From http://www.columbia.edu/kermit/ck80.html#license
+#
+#	"Free Unix Distributions: C-Kermit may be included in "free Unix"
+#	distributions such as GNU/Linux, FreeBSD, NetBSD, and OpenBSD. See the
+#	license for details."
+#
+# A distributions based on OpenEmbedded (OpenZaurus, OpenSimpad etc) is a
+# "free Unix" distribution, therefore we can include the package.
+#
+#
+# Please note that the license is not 100% because it limits what you can
+# do:
+#
+#	"The C-Kermit source code may not be changed without the consent of
+#	the Kermit Project, which will not be unreasonably withheld (this is
+#	simply a matter of keeping a consistent and supportable code base)."
+#
+# But we don't change the source code in any way, so we comply to the license.
+# So, essentially for us C-Kermit is free as in beer, but not in freedom.
+#
+# That is true for other distros. C-Kkermit is distributed by:
+#
+#	Debian:	http://packages.debian.org/unstable/comm/ckermit
+#	Gentoo: http://mirror.pudas.net/gentoo-x86-portage/app-misc/ckermit/ckermit-8.0.211.ebuild
+#	SuSE: http://www.novell.com/products/linuxpackages/enterpriseserver/s390/ckermit.html
+#	Fedora Core: http://cvs.fedora.redhat.com/viewcvs/devel/ckermit/
+#	PLD: http://cvs.pld.org.pl/SPECS/ckermit.spec
+#
+# and, according to the Kermit website http://www.columbia.edu/kermit/ck80.html also with
+#
+#	Red Hat 9 (on earlier Red Hat's it was on the PowerTools CD)
+#	HP-UX
+#	FreeBSD
+#	NetBSD
+#	OpenBSD
+#
+# ... and probably other distro's as well.
+#
+
+export CC2 = "${CC}"
+export BINDIR = "${bindir}"
+export MANDIR = "${mandir}/man1"
+export INFODIR = "${infodir}"
+
+# Additional flags. For uclibc we add -DNOARROWKEYS which stops ckermit
+# trying to look inside the stdio headers.
+CKERMIT_ADDITIONAL = ""
+CKERMIT_ADDITIONAL_libc-uclibc = "-DNOARROWKEYS"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_compile () {
+	# The original makefile doesn't differentiate between CC and CC_FOR_BUILD,
+	# so we build wart manually. Note that you need a ckwart.o with the proper
+	# timestamp to make this hack work:
+	${BUILD_CC} -c ckwart.c
+	${BUILD_CC} -o wart ckwart.o
+	./wart ckcpro.w ckcpro.c
+
+	# read ${S}/ckccfg.txt to understand this :-)
+	oe_runmake wermit CFLAGS="${CFLAGS} -DLINUX -DCK_POSIX_SIG \
+		-DNOTCPOPTS -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR \
+		-DNOSYSLOG -DHAVE_PTMX -DNO_DNS_SRV -DNOGFTIMER \
+		-DNOB_50 -DNOB_75 -DNOB_134 -DNOB_150 -DNOB_200 \
+		-DNOB_1800 -DNOB_3600 -DNOB_7200 -DNOB_76K -DNOB_230K \
+		-DNOB_460K -DNOB_921K \
+		-DNOAPC -DNOCSETS -DNONET -DNOUNICODE -DNOHELP -DNODEBUG \
+		-DNOFRILLS -DNOFTP -DNODIAL -DNOPUSH -DNOIKSD -DNOHTTP -DNOFLOAT \
+		-DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \
+		-DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \
+		-DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \
+		-DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \
+		${CKERMIT_ADDITIONAL}"
+}
+
+do_install () {
+	install -d ${D}${BINDIR} ${D}${MANDIR} ${D}${INFODIR}
+	oe_runmake 'DESTDIR=${D}' 'MANDIR=${D}${MANDIR}' install
+	# Fix up dangling symlink
+	rm ${D}${BINDIR}/kermit-sshsub
+	(cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb)
+}
+
+SRC_URI[md5sum] = "5767ec5e6ff0857cbfe2d3ec1ee0e2bc"
+SRC_URI[sha256sum] = "39e7cd4892502344a635952843487d9b4bfa98e59d1e1acad5ef8aa969abba93"
Signature · 1 line
1.7.5.4
#2 lore raw

Re: [meta-oe][PATCH 1/2] ckermit: import from OE rev 84812c64e7146d75004b3eeecae22b6d1118c1fb

Dear Anders,

Am Dienstag, den 16.08.2011, 11:24 +0200 schrieb Anders Darander:

Quoted 1 line

Adding LIC_FILES_CHKSUM, otherwise it is identical to the oe version.

I always would like to see people adding their build/test configuration to the commit summary so that people can reproduce this when having problems.

Quoted 12 lines
---
 meta-oe/recipes-support/ckermit/ckermit_211.bb |   98 ++++++++++++++++++++++++
 1 files changed, 98 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/ckermit/ckermit_211.bb
meta-oe/recipes-support/ckermit/ckermit_211.bb new file +0 -0
new file mode 100644
index 0000000..86330d3

meta-oe/recipes-support/ckermit/ckermit_211.bb line 9

Quoted 9 lines
meta-oe/recipes-support/ckermit/ckermit_211.bb new file +9 -0
@@ -0,0 +1,98 @@
+DESCRIPTION = "C-Kermit is a combined serial and network communication \
+software package offering a consistent, medium-independent, \
+cross-platform approach to connection establishment, terminal \
+sessions, file transfer, character-set translation, and automation \
+of communication tasks."
+LICENSE = "Kermit"
+LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=17dabbd2543933464b6d32083c3a3596"
+HOMEPAGE = "http://www.columbia.edu/kermit/"
+SECTION = "console/network"

Please order the variables according to the style guide [1][2].

meta-oe/recipes-support/ckermit/ckermit_211.bb line 11

Quoted 2 lines
meta-oe/recipes-support/ckermit/ckermit_211.bb new file +2 -0
+SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV}"
+PR = "r3"

Please start with "r0" when importing recipes.

Quoted 30 lines
meta-oe/recipes-support/ckermit/ckermit_211.bb new file +30 -0
+
+#
+# From http://www.columbia.edu/kermit/ck80.html#license
+#
+#	"Free Unix Distributions: C-Kermit may be included in "free Unix"
+#	distributions such as GNU/Linux, FreeBSD, NetBSD, and OpenBSD. See the
+#	license for details."
+#
+# A distributions based on OpenEmbedded (OpenZaurus, OpenSimpad etc) is a
+# "free Unix" distribution, therefore we can include the package.
+#
+#
+# Please note that the license is not 100% because it limits what you can
+# do:
+#
+#	"The C-Kermit source code may not be changed without the consent of
+#	the Kermit Project, which will not be unreasonably withheld (this is
+#	simply a matter of keeping a consistent and supportable code base)."
+#
+# But we don't change the source code in any way, so we comply to the license.
+# So, essentially for us C-Kermit is free as in beer, but not in freedom.
+#
+# That is true for other distros. C-Kkermit is distributed by:
+#
+#	Debian:	http://packages.debian.org/unstable/comm/ckermit
+#	Gentoo: http://mirror.pudas.net/gentoo-x86-portage/app-misc/ckermit/ckermit-8.0.211.ebuild
+#	SuSE: http://www.novell.com/products/linuxpackages/enterpriseserver/s390/ckermit.html
+#	Fedora Core: http://cvs.fedora.redhat.com/viewcvs/devel/ckermit/
+#	PLD: http://cvs.pld.org.pl/SPECS/ckermit.spec
+#

meta-oe/recipes-support/ckermit/ckermit_211.bb line 51

Quoted 10 lines
meta-oe/recipes-support/ckermit/ckermit_211.bb new file +10 -0
+# and, according to the Kermit website http://www.columbia.edu/kermit/ck80.html also with
+#
+#	Red Hat 9 (on earlier Red Hat's it was on the PowerTools CD)
+#	HP-UX
+#	FreeBSD
+#	NetBSD
+#	OpenBSD
+#
+# ... and probably other distro's as well.
+#

I fixed some typos and committed the patch to oe.dev [3].

[…]

Thanks,

Paul

[1] http://wiki.openembedded.org/index.php/Styleguide
[2] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/recipes/ckermit/ckermit_211.bb?id=9a13ec3a5b1dfc0100fbe1a7716db4ceaff6df7a
[3] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/recipes/ckermit/ckermit_211.bb?id=5350bbef01b8979617e3d0fd38939f94f1fa5315

#3 lore raw

PATCH 2/2 ckermit: update to version 9.0

In reply to Anders Darander

The update changes the license from kermit to BSD.
Remove the NOAPCS compile flag to make the new version compile cleanly.

---
 meta-oe/recipes-support/ckermit/ckermit_211.bb |   98 ------------------------
 meta-oe/recipes-support/ckermit/ckermit_301.bb |   58 ++++++++++++++
 2 files changed, 58 insertions(+), 98 deletions(-)
 delete mode 100644 meta-oe/recipes-support/ckermit/ckermit_211.bb
 create mode 100644 meta-oe/recipes-support/ckermit/ckermit_301.bb
meta-oe/recipes-support/ckermit/ckermit_211.bb deleted +0 -98
deleted file mode 100644
index 86330d3..0000000
@@ -1,98 +0,0 @@
-DESCRIPTION = "C-Kermit is a combined serial and network communication \
-software package offering a consistent, medium-independent, \
-cross-platform approach to connection establishment, terminal \
-sessions, file transfer, character-set translation, and automation \
-of communication tasks."
-LICENSE = "Kermit"
-LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=17dabbd2543933464b6d32083c3a3596"
-HOMEPAGE = "http://www.columbia.edu/kermit/"
-SECTION = "console/network"
-SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV}"
-PR = "r3"
-
-#
-# From http://www.columbia.edu/kermit/ck80.html#license
-#
-#	"Free Unix Distributions: C-Kermit may be included in "free Unix"
-#	distributions such as GNU/Linux, FreeBSD, NetBSD, and OpenBSD. See the
-#	license for details."
-#
-# A distributions based on OpenEmbedded (OpenZaurus, OpenSimpad etc) is a
-# "free Unix" distribution, therefore we can include the package.
-#
-#
-# Please note that the license is not 100% because it limits what you can
-# do:
-#
-#	"The C-Kermit source code may not be changed without the consent of
-#	the Kermit Project, which will not be unreasonably withheld (this is
-#	simply a matter of keeping a consistent and supportable code base)."
-#
-# But we don't change the source code in any way, so we comply to the license.
-# So, essentially for us C-Kermit is free as in beer, but not in freedom.
-#
-# That is true for other distros. C-Kkermit is distributed by:
-#
-#	Debian:	http://packages.debian.org/unstable/comm/ckermit
-#	Gentoo: http://mirror.pudas.net/gentoo-x86-portage/app-misc/ckermit/ckermit-8.0.211.ebuild
-#	SuSE: http://www.novell.com/products/linuxpackages/enterpriseserver/s390/ckermit.html
-#	Fedora Core: http://cvs.fedora.redhat.com/viewcvs/devel/ckermit/
-#	PLD: http://cvs.pld.org.pl/SPECS/ckermit.spec
-#
-# and, according to the Kermit website http://www.columbia.edu/kermit/ck80.html also with
-#
-#	Red Hat 9 (on earlier Red Hat's it was on the PowerTools CD)
-#	HP-UX
-#	FreeBSD
-#	NetBSD
-#	OpenBSD
-#
-# ... and probably other distro's as well.
-#
-
-export CC2 = "${CC}"
-export BINDIR = "${bindir}"
-export MANDIR = "${mandir}/man1"
-export INFODIR = "${infodir}"
-
-# Additional flags. For uclibc we add -DNOARROWKEYS which stops ckermit
-# trying to look inside the stdio headers.
-CKERMIT_ADDITIONAL = ""
-CKERMIT_ADDITIONAL_libc-uclibc = "-DNOARROWKEYS"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_compile () {
-	# The original makefile doesn't differentiate between CC and CC_FOR_BUILD,
-	# so we build wart manually. Note that you need a ckwart.o with the proper
-	# timestamp to make this hack work:
-	${BUILD_CC} -c ckwart.c
-	${BUILD_CC} -o wart ckwart.o
-	./wart ckcpro.w ckcpro.c
-
-	# read ${S}/ckccfg.txt to understand this :-)
-	oe_runmake wermit CFLAGS="${CFLAGS} -DLINUX -DCK_POSIX_SIG \
-		-DNOTCPOPTS -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR \
-		-DNOSYSLOG -DHAVE_PTMX -DNO_DNS_SRV -DNOGFTIMER \
-		-DNOB_50 -DNOB_75 -DNOB_134 -DNOB_150 -DNOB_200 \
-		-DNOB_1800 -DNOB_3600 -DNOB_7200 -DNOB_76K -DNOB_230K \
-		-DNOB_460K -DNOB_921K \
-		-DNOAPC -DNOCSETS -DNONET -DNOUNICODE -DNOHELP -DNODEBUG \
-		-DNOFRILLS -DNOFTP -DNODIAL -DNOPUSH -DNOIKSD -DNOHTTP -DNOFLOAT \
-		-DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \
-		-DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \
-		-DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \
-		-DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \
-		${CKERMIT_ADDITIONAL}"
-}
-
-do_install () {
-	install -d ${D}${BINDIR} ${D}${MANDIR} ${D}${INFODIR}
-	oe_runmake 'DESTDIR=${D}' 'MANDIR=${D}${MANDIR}' install
-	# Fix up dangling symlink
-	rm ${D}${BINDIR}/kermit-sshsub
-	(cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb)
-}
-
-SRC_URI[md5sum] = "5767ec5e6ff0857cbfe2d3ec1ee0e2bc"
-SRC_URI[sha256sum] = "39e7cd4892502344a635952843487d9b4bfa98e59d1e1acad5ef8aa969abba93"
meta-oe/recipes-support/ckermit/ckermit_301.bb new file +58 -0

58 lines not on this page · raw message

Signature · 1 line
1.7.5.4
Reviewed-by on v1 2/2
#4 lore raw

Re: [meta-oe][PATCH 2/2] ckermit: update to version 9.0

Am Dienstag, den 16.08.2011, 11:24 +0200 schrieb Anders Darander:

Quoted 2 lines

The update changes the license from kermit to BSD.
Remove the NOAPCS compile flag to make the new version compile cleanly.

What configuration did you use for build and run testing?

Quoted 7 lines
---
 meta-oe/recipes-support/ckermit/ckermit_211.bb |   98 ------------------------
 meta-oe/recipes-support/ckermit/ckermit_301.bb |   58 ++++++++++++++
 2 files changed, 58 insertions(+), 98 deletions(-)
 delete mode 100644 meta-oe/recipes-support/ckermit/ckermit_211.bb
 create mode 100644 meta-oe/recipes-support/ckermit/ckermit_301.bb

Please pass -M -M -C -C -C(?) to git format-patch to make reviews easier.

[…]

meta-oe/recipes-support/ckermit/ckermit_301.bb

Quoted 1 line
meta-oe/recipes-support/ckermit/ckermit_301.bb +0 -0

The version numbers seem quite confusing. Why is this 9.0? But that is an upstream problem.

[…]

Thanks,

Paul

#5 lore raw

Re: [meta-oe][PATCH 2/2] ckermit: update to version 9.0

Quoted 10 lines · Paul Menzel

Am Dienstag, den 16.08.2011, 11:24 +0200 schrieb Anders Darander:

Quoted 6 lines
---
 meta-oe/recipes-support/ckermit/ckermit_211.bb |   98 ------------------------
 meta-oe/recipes-support/ckermit/ckermit_301.bb |   58 ++++++++++++++
 2 files changed, 58 insertions(+), 98 deletions(-)
 delete mode 100644 meta-oe/recipes-support/ckermit/ckermit_211.bb
 create mode 100644 meta-oe/recipes-support/ckermit/ckermit_301.bb

Please pass -M -M -C -C -C(?) to git format-patch to make reviews easier.

-M40 seemed to do it this time. The main question is where to put that threshold between seeing a rename or an add/delete-pair. I might make a suggestion in a patch for the create-pull-request script in oe-core.

Quoted 4 lines

meta-oe/recipes-support/ckermit/ckermit_301.bb

Quoted 1 line
meta-oe/recipes-support/ckermit/ckermit_301.bb +0 -0

The version numbers seem quite confusing. Why is this 9.0? But that is an upstream problem.

I agree that they are using a really confusing version numbering scheme... Unfortunately, that's something we'll have to live with.

Cheers,
Anders

Signature · 4 lines
Anders Darander
ChargeStorm AB		Tel: +46 702 44 84 36
Laxholmstorget 3	Email: [email protected]
602 21 Norrköping	Web: www.chargestorm.se