On Mon, Mar 06, 2017 at 11:13:39PM -0800, Khem Raj wrote: > Additional patches are upstream to fix build with gcc6 and clang > Add systemd unit file > > Signed-off-by: Khem Raj > --- > ... > > diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch b/meta-oe/recipes-support/gpm/gpm/processcreds.patch > similarity index 100% > rename from meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch > rename to meta-oe/recipes-support/gpm/gpm/processcreds.patch > diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb > index bbb8c28ac..7697772ca 100644 > --- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb > +++ b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb > @@ -5,49 +5,39 @@ SECTION = "console/utils" > LICENSE = "GPLv2+" > LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f" NOTE: recipe gpm-1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2: task do_populate_lic: Started WARNING: gpm-1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2 do_populate_lic: Could not copy license file /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/gpm/1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2/git/gpm2/core/main.c to /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/gpm/1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2/license-destdir/gpm/main.c: [Errno 2] No such file or directory: '/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/gpm/1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2/git/gpm2/core/main.c' ERROR: gpm-1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2 do_populate_lic: QA Issue: gpm: LIC_FILES_CHKSUM points to an invalid file: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/gpm/1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2/git/gpm2/core/main.c [license-checksum] NOTE: recipe gpm-1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2: task do_configure: Started NOTE: recipe gpm-1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2: task do_populate_lic: Succeeded > > +PV .="+git${SRCREV}" Isn't it better to rename the recipe to gpm_git.bb and set whole version inside the recipe? > PR = "r2" > > DEPENDS = "ncurses" > > -SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \ > +SRC_URI = "git://github.com/telmich/gpm;protocol=git;branch=master \ You can drop protocol and branch parameters as it's default. > file://no-docs.patch \ > file://processcreds.patch \ > - file://eglibc-2.17.patch \ > - file://remove_nested_functions.patch \ > file://init" > > -inherit autotools-brokensep update-rc.d > +SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" > +S = "${WORKDIR}/git" > + > +inherit autotools-brokensep update-rc.d systemd > > INITSCRIPT_NAME = "gpm" > INITSCRIPT_PARAMS = "defaults" > > -#export LIBS = "-lm" > - > -# all fields are /* FIXME: gpm 1.99.13 */ > -# gpm-1.99.7/src/lib/libhigh.c:171:43: error: parameter 'clientdata' set but not used [-Werror=unused-but-set-parameter] > -# gpm-1.99.7/src/lib/report-lib.c:28:21: error: parameter 'line' set but not used [-Werror=unused-but-set-parameter] > -# gpm-1.99.7/src/lib/report-lib.c:28:33: error: parameter 'file' set but not used [-Werror=unused-but-set-parameter] > -# gpm-1.99.7/src/drivers/empty/i.c:26:23: error: parameter 'fd' set but not used [-Werror=unused-but-set-parameter] > -# gpm-1.99.7/src/drivers/empty/i.c:26:42: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] > -# gpm-1.99.7/src/drivers/etouch/i.c:34:43: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] > -# gpm-1.99.7/src/drivers/msc/r.c:32:12: error: variable 'dy' set but not used [-Werror=unused-but-set-variable] > -# gpm-1.99.7/src/drivers/msc/r.c:32:8: error: variable 'dx' set but not used [-Werror=unused-but-set-variable] > -# cc1: all warnings being treated as errors > -CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable" > - > -# twiddler is WIP in 1.99.7 and probably not worth fixing (a lot of changes in gpm-2-dev after 1.99.7 > -# gpm-1.99.7/src/drivers/twid/twiddler.c:503:14: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] > -# /gpm-1.99.7/src/mice.c:221:5: error: (near initialization for 'mice[32].init') [-Werror] > -CFLAGS += "-Wno-error=int-to-pointer-cast -Wno-error" > - > -do_install () { > - oe_runmake 'DESTDIR=${D}' install > - install -m 0644 src/headers/gpm.h ${D}${includedir} > - install -d ${D}/${sysconfdir}/init.d > - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm > - cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1 > +do_configure_prepend() { > + (cd ${S};./autogen.sh;cd -) > +} > + > +do_install_append () { > + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then > + install -d ${D}${systemd_system_unitdir} > + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service > + fi > + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then > + install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm > + fi > + install -D -m 0644 ${S}/src/headers/gpm.h ${D}${includedir}/gpm.h > } > -SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544" > -SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee" > + > +SYSTEMD_SERVICE_${PN} = "gpm.service" > > FILES_${PN} += "${datadir}/emacs" > -- > 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