From 1b793a9abc6f0b884b63dbdd545acdd002b98ae6 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 28 Aug 2017 21:14:56 -0400 Subject: netcf: upgrade to latest 0.2.8 Fix compile failure while gnulib upgraded to 2017-08-20.18 ... | In file included from ../../../git/gnulib/lib/printf-args.h:41:0, | from ../../../git/gnulib/lib/printf-parse.h:29, | from ../../../git/gnulib/lib/printf-parse.c:36: | ./wchar.h:571:6: error: #if with no expression | # if ... Update HOMEPAGE, SRC_URI since the formers are obsolete. Update SRCREV, although version not change, but the former was two years ago. Tweak PV. Signed-off-by: Hongxu Jia Signed-off-by: Martin Jansa --- .../recipes-support/netcf/netcf_0.2.8.bb | 71 ++++++++++++++++++++++ meta-networking/recipes-support/netcf/netcf_git.bb | 69 --------------------- 2 files changed, 71 insertions(+), 69 deletions(-) create mode 100644 meta-networking/recipes-support/netcf/netcf_0.2.8.bb delete mode 100644 meta-networking/recipes-support/netcf/netcf_git.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb new file mode 100644 index 0000000000..9a6f60ea22 --- /dev/null +++ b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb @@ -0,0 +1,71 @@ +SUMMARY = "netcf" +DESCRIPTION = "netcf is a cross-platform network configuration library." +HOMEPAGE = "https://pagure.io/netcf" +SECTION = "libs" +LICENSE = "LGPLv2.1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f" + +SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4" +PV .= "+git${SRCPV}" + +SRC_URI = "git://pagure.io/netcf.git;protocol=https \ +" + +DEPENDS += "augeas libnl libxslt libxml2 gnulib" + +S = "${WORKDIR}/git" + +inherit gettext autotools pkgconfig systemd + +EXTRA_OECONF_append_class-target = " --with-driver=redhat" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," + +EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" + +do_configure_prepend() { + currdir=`pwd` + cd ${S} + + # avoid bootstrap cloning gnulib on every configure + # the dir starts out empty from the pkg, but unconditionally blow it + # away so if we reconfigure due to gnulib sysroot sig changes, we will + # get the newer gnulib content into the build here. + rm -rf ${S}/.gnulib + cp -rf ${STAGING_DATADIR}/gnulib ${S}/.gnulib + + # --force to avoid errors on reconfigure e.g if recipes changed we depend on + # | bootstrap: running: libtoolize --quiet + # | libtoolize: error: 'libltdl/COPYING.LIB' exists: use '--force' to overwrite + # | ... + ./bootstrap --force --no-git --gnulib-srcdir=.gnulib + + cd $currdir +} + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + if [ -d "${D}${libdir}/systemd/system" ]; then + if [ "${systemd_unitdir}" != "${libdir}/systemd" ] ; then + mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ + rm -rf ${D}${libdir}/systemd/ + fi + elif [ "${systemd_unitdir}" != "${nonarch_libdir}/systemd" ] ; then + mv ${D}${nonarch_libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ + rm -rf ${D}${nonarch_libdir}/systemd/ + fi + else + mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir} + rm -rf ${D}${sysconfdir}/rc.d/ + fi +} + +FILES_${PN} += " \ + ${libdir} \ + ${nonarch_libdir} \ + " + +SYSTEMD_SERVICE_${PN} = "netcf-transaction.service" diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb b/meta-networking/recipes-support/netcf/netcf_git.bb deleted file mode 100644 index a7a5000e27..0000000000 --- a/meta-networking/recipes-support/netcf/netcf_git.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "netcf" -DESCRIPTION = "netcf is a cross-platform network configuration library." -HOMEPAGE = "https://fedorahosted.org/netcf/" -SECTION = "libs" -LICENSE = "LGPLv2.1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" - -SRCREV = "9158278ad35b46ce9a49b2e887483c6d8c287994" -PV = "0.2.8+git${SRCPV}" - -SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \ -" - -DEPENDS += "augeas libnl libxslt libxml2 gnulib" - -S = "${WORKDIR}/git" - -inherit gettext autotools pkgconfig systemd - -EXTRA_OECONF_append_class-target = " --with-driver=redhat" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," - -do_configure_prepend() { - currdir=`pwd` - cd ${S} - - # avoid bootstrap cloning gnulib on every configure - # the dir starts out empty from the pkg, but unconditionally blow it - # away so if we reconfigure due to gnulib sysroot sig changes, we will - # get the newer gnulib content into the build here. - rm -rf ${S}/.gnulib - cp -rf ${STAGING_DATADIR}/gnulib ${S}/.gnulib - - # --force to avoid errors on reconfigure e.g if recipes changed we depend on - # | bootstrap: running: libtoolize --quiet - # | libtoolize: error: 'libltdl/COPYING.LIB' exists: use '--force' to overwrite - # | ... - ./bootstrap --force --no-git --gnulib-srcdir=.gnulib - - cd $currdir -} - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - if [ -d "${D}${libdir}/systemd/system" ]; then - if [ "${systemd_unitdir}" != "${libdir}/systemd" ] ; then - mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ - rm -rf ${D}${libdir}/systemd/ - fi - elif [ "${systemd_unitdir}" != "${nonarch_libdir}/systemd" ] ; then - mv ${D}${nonarch_libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ - rm -rf ${D}${nonarch_libdir}/systemd/ - fi - else - mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir} - rm -rf ${D}${sysconfdir}/rc.d/ - fi -} - -FILES_${PN} += " \ - ${libdir} \ - ${nonarch_libdir} \ - " - -SYSTEMD_SERVICE_${PN} = "netcf-transaction.service" -- cgit 1.2.3-korg