The update changes the license from kermit to BSD. Remove the NOAPCS compile flag to make the new version compile cleanly.
Signed-off-by: Anders Darander <[email protected]> --- 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 diff --git a/meta-oe/recipes-support/ckermit/ckermit_211.bb b/meta-oe/recipes-support/ckermit/ckermit_211.bb deleted file mode 100644 index 86330d3..0000000 --- a/meta-oe/recipes-support/ckermit/ckermit_211.bb +++ /dev/null @@ -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" diff --git a/meta-oe/recipes-support/ckermit/ckermit_301.bb b/meta-oe/recipes-support/ckermit/ckermit_301.bb new file mode 100644 index 0000000..818a571 --- /dev/null +++ b/meta-oe/recipes-support/ckermit/ckermit_301.bb @@ -0,0 +1,58 @@ +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 = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=932ca542d6c6cb8a59a0bcd76ab67cc3" +HOMEPAGE = "http://www.columbia.edu/kermit/"; +SECTION = "console/network" +SRC_URI = "ftp://www.columbia.edu/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV}"; +PR = "r0" + +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 \ + -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}' install + # Fix up dangling symlink + rm ${D}${BINDIR}/kermit-sshsub + (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb) +} + +SRC_URI[md5sum] = "59e80f909edf305933af8e0348dcc5d7" +SRC_URI[sha256sum] = "9793eb125f8936b079c6d7e5c3d2ff885cfedc07f9d2dd1e7db928e3029a211a" -- 1.7.5.4 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
