From cd03ef79b50ed42b9d407ee45fc3e3321385281c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Feb 2015 16:23:39 +0000 Subject: libtool: 2.4.5 -> 2.4.6 Drop patch merged upstream. Signed-off-by: Richard Purdie --- meta/recipes-devtools/libtool/libtool-2.4.5.inc | 52 ---------------- meta/recipes-devtools/libtool/libtool-2.4.6.inc | 51 ++++++++++++++++ .../libtool/libtool-cross_2.4.5.bb | 41 ------------- .../libtool/libtool-cross_2.4.6.bb | 41 +++++++++++++ .../libtool/libtool-native_2.4.5.bb | 22 ------- .../libtool/libtool-native_2.4.6.bb | 22 +++++++ ...-t-execute-automake-and-autoconf-on-every.patch | 71 ---------------------- meta/recipes-devtools/libtool/libtool_2.4.5.bb | 26 -------- meta/recipes-devtools/libtool/libtool_2.4.6.bb | 26 ++++++++ .../libtool/nativesdk-libtool_2.4.5.bb | 31 ---------- .../libtool/nativesdk-libtool_2.4.6.bb | 31 ++++++++++ 11 files changed, 171 insertions(+), 243 deletions(-) delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.5.inc create mode 100644 meta/recipes-devtools/libtool/libtool-2.4.6.inc delete mode 100644 meta/recipes-devtools/libtool/libtool-cross_2.4.5.bb create mode 100644 meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb delete mode 100644 meta/recipes-devtools/libtool/libtool-native_2.4.5.bb create mode 100644 meta/recipes-devtools/libtool/libtool-native_2.4.6.bb delete mode 100644 meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch delete mode 100644 meta/recipes-devtools/libtool/libtool_2.4.5.bb create mode 100644 meta/recipes-devtools/libtool/libtool_2.4.6.bb delete mode 100644 meta/recipes-devtools/libtool/nativesdk-libtool_2.4.5.bb create mode 100644 meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb (limited to 'meta/recipes-devtools/libtool') diff --git a/meta/recipes-devtools/libtool/libtool-2.4.5.inc b/meta/recipes-devtools/libtool/libtool-2.4.5.inc deleted file mode 100644 index 0f6bdc83ee..0000000000 --- a/meta/recipes-devtools/libtool/libtool-2.4.5.inc +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Generic library support script" -DESCRIPTION = "This is GNU libtool, a generic library support script. \ -Libtool hides the complexity of generating special library types \ -(such as shared libraries) behind a consistent interface." -HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" -SECTION = "devel" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c " - -SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ - file://trailingslash.patch \ - file://rename-with-sysroot.patch \ - file://use-sysroot-in-libpath.patch \ - file://fix-final-rpath.patch \ - file://fix-rpath.patch \ - file://norm-rpath.patch \ - file://dont-depend-on-help2man.patch \ - file://fix-resolve-lt-sysroot.patch \ - file://nohardcodepaths.patch \ - file://unwind-opt-parsing.patch \ - file://libtool-don-t-execute-automake-and-autoconf-on-every.patch \ - " - -SRC_URI[md5sum] = "7d30ed9fa6bb11270ebb31639a37bd54" -SRC_URI[sha256sum] = "509cb49c7de14ce7eaf88993cf09fd4071882699dfd874c2e95b31ab107d6987" - -do_compile_prepend () { - # Sometimes this file doesn't get rebuilt, force the issue - rm -f ${S}/build-aux/ltmain.sh - make build-aux/ltmain.sh - ./config.status -} - -inherit autotools texinfo -EXTRA_AUTORECONF = "--exclude=libtoolize" - -DEPENDS = "libtool-native" - -PACKAGES =+ "libltdl libltdl-dev libltdl-dbg libltdl-staticdev" -FILES_${PN} += "${datadir}/aclocal" -FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \ - ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \ - ${base_libdir}/*.o ${libdir}/${BPN}/*.la ${base_libdir}/*.la" - -#FILES_${PN}-dev := "${@oe_filter_out('${datadir}/aclocal', '${FILES_libtool-dev}', d)}" -FILES_libltdl = "${libdir}/libltdl${SOLIBS}" -FILES_libltdl-dev = "${libdir}/libltdl${SOLIBSDEV} ${includedir}" -FILES_libltdl-staticdev = "${libdir}/libltdl.a" -FILES_libltdl-dbg = "${libdir}/.debug/" - -export CONFIG_SHELL="/bin/bash" diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc new file mode 100644 index 0000000000..ff5abcb239 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc @@ -0,0 +1,51 @@ +SUMMARY = "Generic library support script" +DESCRIPTION = "This is GNU libtool, a generic library support script. \ +Libtool hides the complexity of generating special library types \ +(such as shared libraries) behind a consistent interface." +HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" +SECTION = "devel" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c " + +SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ + file://trailingslash.patch \ + file://rename-with-sysroot.patch \ + file://use-sysroot-in-libpath.patch \ + file://fix-final-rpath.patch \ + file://fix-rpath.patch \ + file://norm-rpath.patch \ + file://dont-depend-on-help2man.patch \ + file://fix-resolve-lt-sysroot.patch \ + file://nohardcodepaths.patch \ + file://unwind-opt-parsing.patch \ + " + +SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" +SRC_URI[sha256sum] = "e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3" + +do_compile_prepend () { + # Sometimes this file doesn't get rebuilt, force the issue + rm -f ${S}/build-aux/ltmain.sh + make build-aux/ltmain.sh + ./config.status +} + +inherit autotools texinfo +EXTRA_AUTORECONF = "--exclude=libtoolize" + +DEPENDS = "libtool-native" + +PACKAGES =+ "libltdl libltdl-dev libltdl-dbg libltdl-staticdev" +FILES_${PN} += "${datadir}/aclocal" +FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \ + ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \ + ${base_libdir}/*.o ${libdir}/${BPN}/*.la ${base_libdir}/*.la" + +#FILES_${PN}-dev := "${@oe_filter_out('${datadir}/aclocal', '${FILES_libtool-dev}', d)}" +FILES_libltdl = "${libdir}/libltdl${SOLIBS}" +FILES_libltdl-dev = "${libdir}/libltdl${SOLIBSDEV} ${includedir}" +FILES_libltdl-staticdev = "${libdir}/libltdl.a" +FILES_libltdl-dbg = "${libdir}/.debug/" + +export CONFIG_SHELL="/bin/bash" diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.5.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.5.bb deleted file mode 100644 index 847880270d..0000000000 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.5.bb +++ /dev/null @@ -1,41 +0,0 @@ -require libtool-${PV}.inc - -PACKAGES = "" -SRC_URI += "file://prefix.patch" -SRC_URI += "file://fixinstall.patch" - -datadir = "${STAGING_DIR_TARGET}${target_datadir}" - -do_configure_prepend () { - # Remove any existing libtool m4 since old stale versions would break - # any upgrade - rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 - rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 -} - -do_install () { - install -d ${D}${bindir_crossscripts}/ - install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool - install -d ${D}${bindir_crossscripts}/ - GREP='/bin/grep' SED='sed' ${S}/build-aux/inline-source libtoolize > ${D}${bindir_crossscripts}/libtoolize - chmod 0755 ${D}${bindir_crossscripts}/libtoolize - install -d ${D}${target_datadir}/libtool/build-aux/ - install -d ${D}${target_datadir}/aclocal/ - install -c ${S}/build-aux/compile ${D}${target_datadir}/libtool/build-aux/ - install -c ${S}/build-aux/config.guess ${D}${target_datadir}/libtool/build-aux/ - install -c ${S}/build-aux/config.sub ${D}${target_datadir}/libtool/build-aux/ - install -c ${S}/build-aux/depcomp ${D}${target_datadir}/libtool/build-aux/ - install -c ${S}/build-aux/install-sh ${D}${target_datadir}/libtool/build-aux/ - install -c ${S}/build-aux/missing ${D}${target_datadir}/libtool/build-aux/ - install -c -m 0644 ${S}/build-aux/ltmain.sh ${D}${target_datadir}/libtool/build-aux/ - install -c -m 0644 ${S}/m4/*.m4 ${D}${target_datadir}/aclocal/ -} - -SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess" - -libtoolcross_sysroot_preprocess () { - sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts} - sysroot_stage_dir ${D}${target_datadir} ${SYSROOT_DESTDIR}${target_datadir} -} - -SSTATE_SCAN_FILES += "libtoolize *-libtool" diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb new file mode 100644 index 0000000000..847880270d --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb @@ -0,0 +1,41 @@ +require libtool-${PV}.inc + +PACKAGES = "" +SRC_URI += "file://prefix.patch" +SRC_URI += "file://fixinstall.patch" + +datadir = "${STAGING_DIR_TARGET}${target_datadir}" + +do_configure_prepend () { + # Remove any existing libtool m4 since old stale versions would break + # any upgrade + rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 + rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 +} + +do_install () { + install -d ${D}${bindir_crossscripts}/ + install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool + install -d ${D}${bindir_crossscripts}/ + GREP='/bin/grep' SED='sed' ${S}/build-aux/inline-source libtoolize > ${D}${bindir_crossscripts}/libtoolize + chmod 0755 ${D}${bindir_crossscripts}/libtoolize + install -d ${D}${target_datadir}/libtool/build-aux/ + install -d ${D}${target_datadir}/aclocal/ + install -c ${S}/build-aux/compile ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/config.guess ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/config.sub ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/depcomp ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/install-sh ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/missing ${D}${target_datadir}/libtool/build-aux/ + install -c -m 0644 ${S}/build-aux/ltmain.sh ${D}${target_datadir}/libtool/build-aux/ + install -c -m 0644 ${S}/m4/*.m4 ${D}${target_datadir}/aclocal/ +} + +SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess" + +libtoolcross_sysroot_preprocess () { + sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts} + sysroot_stage_dir ${D}${target_datadir} ${SYSROOT_DESTDIR}${target_datadir} +} + +SSTATE_SCAN_FILES += "libtoolize *-libtool" diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.5.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.5.bb deleted file mode 100644 index 4c5218ade0..0000000000 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.5.bb +++ /dev/null @@ -1,22 +0,0 @@ -require libtool-${PV}.inc - -DEPENDS = "" - -SRC_URI += "file://prefix.patch" - -inherit native - -EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}" - -do_configure_prepend () { - # Remove any existing libtool m4 since old stale versions would break - # any upgrade - rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 - rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 -} - -do_install () { - autotools_do_install - install -d ${D}${bindir}/ - install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool -} diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb new file mode 100644 index 0000000000..4c5218ade0 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb @@ -0,0 +1,22 @@ +require libtool-${PV}.inc + +DEPENDS = "" + +SRC_URI += "file://prefix.patch" + +inherit native + +EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}" + +do_configure_prepend () { + # Remove any existing libtool m4 since old stale versions would break + # any upgrade + rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 + rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 +} + +do_install () { + autotools_do_install + install -d ${D}${bindir}/ + install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool +} diff --git a/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch b/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch deleted file mode 100644 index 87ffae12ee..0000000000 --- a/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 408cfb9c5fa8a666917167ffb806cb19deded429 Mon Sep 17 00:00:00 2001 -From: "Gary V. Vaughan" -Date: Fri, 6 Feb 2015 12:58:34 +0000 -Subject: [PATCH] libtool: don't execute automake and autoconf on every - invocation. - -Regression from 2.4.2 was causing noticable slow-down in builds -that call libtool many times. -* build-aux/ltmain.in (func_help): Override func_help() from -gl/build-aux/options-parser to only run automake --version and -autoconf --version when libtool --help is executed on the command -line. -* NO-THANKS: Add Robert Yang. -Reported by Robert Yang - -Signed-off-by: Gary V. Vaughan - -Updated: Change NO-THANKS to THANKS to apply the patch since upstream -renamed it. - -Upstream-Stauts: Backport - -Signed-off-by: Robert Yang - ---- - THANKS | 1 + - build-aux/ltmain.in | 9 ++++++++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/THANKS b/THANKS -index 0ab162d..aa7aa8c 100644 ---- a/THANKS -+++ b/THANKS -@@ -258,6 +258,7 @@ Robert Garron Robert.Garron@Access3000.net - Robert Millan rmh@aybabtu.com - Robert Ögren lists@roboros.com - Roberto Bagnara bagnara@cs.unipr.it -+Robert Yang liezhi.yang@windriver.com - Roger Cornelius rac@tenzing.org - Roland Mainz roland.mainz@nrubsig.org - Roumen Petrov bugtrack@roumenpetrov.info -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 46a0bb5..d5cf07a 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -127,7 +127,12 @@ usage_message="Options: - " - - # Additional text appended to 'usage_message' in response to '--help'. --long_help_message=$long_help_message" -+func_help () -+{ -+ $debug_cmd -+ -+ func_usage_message -+ $ECHO "$long_help_message - - MODE must be one of the following: - -@@ -158,6 +163,8 @@ include the following information: - Report bugs to <@PACKAGE_BUGREPORT@>. - GNU @PACKAGE@ home page: <@PACKAGE_URL@>. - General help using GNU software: ." -+ exit 0 -+} - - - # func_lo2o OBJECT-NAME --- -1.7.9.5 - diff --git a/meta/recipes-devtools/libtool/libtool_2.4.5.bb b/meta/recipes-devtools/libtool/libtool_2.4.5.bb deleted file mode 100644 index 45f1b2f3a9..0000000000 --- a/meta/recipes-devtools/libtool/libtool_2.4.5.bb +++ /dev/null @@ -1,26 +0,0 @@ -require libtool-${PV}.inc - -RDEPENDS_${PN} += "bash" - -# -# We want the results of libtool-cross preserved - don't stage anything ourselves. -# -SYSROOT_PREPROCESS_FUNCS += "libtool_sysroot_preprocess" - -do_install_append () { - sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \ - -e 's@${STAGING_DIR_HOST}@@g' \ - -e 's@^\(sys_lib_search_path_spec="\).*@\1${libdir} ${base_libdir}"@' \ - -e 's@^\(compiler_lib_search_dirs="\).*@\1${libdir} ${base_libdir}"@' \ - -e 's@^\(compiler_lib_search_path="\).*@\1${libdir} ${base_libdir}"@' \ - -e 's@^\(predep_objects="\).*@\1"@' \ - -e 's@^\(postdep_objects="\).*@\1"@' \ - -i ${D}${bindir}/libtool -} - -libtool_sysroot_preprocess () { - rm -rf ${SYSROOT_DESTDIR}${bindir}/* - rm -rf ${SYSROOT_DESTDIR}${datadir}/aclocal/* - rm -rf ${SYSROOT_DESTDIR}${datadir}/libtool/build-aux/* -} - diff --git a/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/meta/recipes-devtools/libtool/libtool_2.4.6.bb new file mode 100644 index 0000000000..45f1b2f3a9 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool_2.4.6.bb @@ -0,0 +1,26 @@ +require libtool-${PV}.inc + +RDEPENDS_${PN} += "bash" + +# +# We want the results of libtool-cross preserved - don't stage anything ourselves. +# +SYSROOT_PREPROCESS_FUNCS += "libtool_sysroot_preprocess" + +do_install_append () { + sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \ + -e 's@${STAGING_DIR_HOST}@@g' \ + -e 's@^\(sys_lib_search_path_spec="\).*@\1${libdir} ${base_libdir}"@' \ + -e 's@^\(compiler_lib_search_dirs="\).*@\1${libdir} ${base_libdir}"@' \ + -e 's@^\(compiler_lib_search_path="\).*@\1${libdir} ${base_libdir}"@' \ + -e 's@^\(predep_objects="\).*@\1"@' \ + -e 's@^\(postdep_objects="\).*@\1"@' \ + -i ${D}${bindir}/libtool +} + +libtool_sysroot_preprocess () { + rm -rf ${SYSROOT_DESTDIR}${bindir}/* + rm -rf ${SYSROOT_DESTDIR}${datadir}/aclocal/* + rm -rf ${SYSROOT_DESTDIR}${datadir}/libtool/build-aux/* +} + diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.5.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.5.bb deleted file mode 100644 index 508eade326..0000000000 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.5.bb +++ /dev/null @@ -1,31 +0,0 @@ -require libtool-${PV}.inc - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:" - -SRC_URI += "file://prefix.patch" -SRC_URI += "file://fixinstall.patch" - -inherit nativesdk - -S = "${WORKDIR}/libtool-${PV}" -FILES_${PN} += "${datadir}/libtool/*" - -do_configure_prepend () { - # Remove any existing libtool m4 since old stale versions would break - # any upgrade - rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 - rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 -} - -do_install () { - autotools_do_install - install -d ${D}${bindir}/ - install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/ -} - -SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess" - -libtoolnativesdk_sysroot_preprocess () { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool -} diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb new file mode 100644 index 0000000000..508eade326 --- /dev/null +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb @@ -0,0 +1,31 @@ +require libtool-${PV}.inc + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:" + +SRC_URI += "file://prefix.patch" +SRC_URI += "file://fixinstall.patch" + +inherit nativesdk + +S = "${WORKDIR}/libtool-${PV}" +FILES_${PN} += "${datadir}/libtool/*" + +do_configure_prepend () { + # Remove any existing libtool m4 since old stale versions would break + # any upgrade + rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 + rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 +} + +do_install () { + autotools_do_install + install -d ${D}${bindir}/ + install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/ +} + +SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess" + +libtoolnativesdk_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool +} -- cgit 1.2.3-korg