From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ADEEC138262 for ; Sun, 22 May 2016 21:22:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B56E0234024; Sun, 22 May 2016 21:22:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80F44234019 for ; Sun, 22 May 2016 21:22:07 +0000 (UTC) Received: from smtpd.astrali.lan (cable-86-56-10-222.cust.telecolumbus.net [86.56.10.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: hd_brummy) by smtp.gentoo.org (Postfix) with ESMTPSA id 583AD340C66 for ; Sun, 22 May 2016 21:22:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by server.astrali.lan (Postfix) with ESMTP id 55FB34452D for ; Sun, 22 May 2016 23:22:02 +0200 (CEST) X-Virus-Scanned: amavisd-new at astrali.lan Received: from smtpd.astrali.lan ([127.0.0.1]) by localhost (server.astrali.lan [127.0.0.1]) (amavisd-new, port 10024) with LMTP id j6F1AX1FCGVO for ; Sun, 22 May 2016 23:21:59 +0200 (CEST) Received: from [192.168.3.9] (newmain.astrali.lan [192.168.3.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtpd.astrali.lan (Postfix) with ESMTPS id D10E244455 for ; Sun, 22 May 2016 23:21:59 +0200 (CEST) Subject: Re: [gentoo-dev] eclass/vdr-plugin-2.eclass EAPI=6 changes, plz review To: gentoo-dev@lists.gentoo.org References: <5739954B.4030102@astrali.lan> <10D376FC-417F-40A5-A151-0AC8296A7854@gentoo.org> From: Joerg Bornkessel X-Enigmail-Draft-Status: N1110 Message-ID: <574222F7.7080206@astrali.lan> Date: Sun, 22 May 2016 23:21:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 In-Reply-To: <10D376FC-417F-40A5-A151-0AC8296A7854@gentoo.org> Content-Type: multipart/mixed; boundary="------------060205030201090704030704" X-Archives-Salt: c502ddd9-5ad3-4c24-9548-665173d48f06 X-Archives-Hash: 2964580a988af80c3209e18711f169d8 This is a multi-part message in MIME format. --------------060205030201090704030704 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Am 17.05.2016 um 08:17 schrieb Michał Górny: > However, a few general suggestions: > > 1. Split this into multiple commits. Generic cleanup should happen > separately from EAPI 6 support. And it would probably be a good > idea to remove features one at a time, so that reverting would be > possible. its my plan, step by step > > 2. Prefer logic that evaluates to true for future EAPIs. For > example, instead of [[ ${EAPI} == 6 ]], it's better to say != > [012345], so that we won't have to extend the list with every new > EAPI if nothing changes. done > > 3. Please namespace the eclass functions. Using generic names is > really asking for trouble. vdr_ prefix should be sufficient. ToDo > > 4. Please kill that src_util helper. It makes the logic terribly > hard to follow, and there's really no reason to use case over > separate functions. yepp, this takes my also a lot of headattack by the rewrite from vdr-plugin to vdr-plugin-2 eclass ToDo... > > 5. There are some missing || die, for example after cd. done - --- vdr-plugin-2.eclass 2016-05-22 22:27:12.081956660 +0200 +++ vdr-plugin-2.eclass.new 2016-05-22 23:10:11.908404939 +0200 @@ -1,4 +1,4 @@ - -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -90,7 +90,7 @@ # @CODE # Applying your own local/user patches: - -# This is done by using the +# This is done by using the # (EAPI = 4,5) epatch_user() function of the eutils.eclass, # (EAPI = 6) eapply_user function integrated in EAPI = 6. # Simply add your patches into one of these directories: @@ -104,10 +104,7 @@ inherit flag-o-matic toolchain-funcs unpacker case ${EAPI:-0} in - - 4|5) - - ;; - - 6) - - ewarn "EAPI 6 support for test purpose only, plz report bugs to vdr@gentoo.org" + 4|5|6) ;; *) die "EAPI ${EAPI} unsupported." ;; @@ -145,6 +142,7 @@ # Called from src_install # file maintained by normal portage-methods create_plugindb_file() { + #ToDo: rename this to vdr_... local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/ local DB_FILE="${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}" insinto "${NEW_VDRPLUGINDB_DIR}" @@ -156,6 +154,7 @@ # EBUILD=${CATEGORY}/${PN} # EBUILD_V=${PVR} # EOT +# obsolet? fix me later... { echo "VDRPLUGIN_DB=1" echo "CREATOR=ECLASS" @@ -166,6 +165,7 @@ } create_header_checksum_file() { + #ToDo: rename this to vdr_... # Danger: Not using $ROOT here, as compile will also not use it !!! # If vdr in $ROOT and / differ, plugins will not run anyway @@ -232,6 +232,7 @@ #sed -i Makefile \ # -e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \ # -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' + # obsolet? fix me later... if ! grep -q APIVERSION Makefile; then ebegin " Converting to APIVERSION" @@ -260,6 +261,7 @@ } dev_check() { + # ToDo: rename this to vdr_...; IMPORTANT: check availabel plugins, if we use this function in the tree... # A lot useful debug infos # set VDR_MAINTAINER_MODE="1" in make.conf if [[ -n ${VDR_MAINTAINER_MODE} ]]; then @@ -268,6 +270,7 @@ } gettext_missing() { + #ToDo: remane this to vdr_... # plugins without converting to gettext local GETTEXT_MISSING=$( grep xgettext Makefile ) @@ -277,6 +280,7 @@ } detect_po_dir() { + # ToDo: remane this to vdr_... # helper function [[ -f po ]] && local po_dir="${S}" @@ -287,9 +291,10 @@ } linguas_support() { + # ToDo: remane this to vdr_... # Patching Makefile for linguas support. # Only locales, enabled through the LINGUAS (make.conf) variable will be - -# "compiled" and installed. +# compiled and installed. einfo "Patching for Linguas support" einfo "available Languages for ${P} are:" @@ -311,12 +316,9 @@ vdr_i18n() { # i18n handling was deprecated since >=media-video/vdr-1.5.9, # finally with >=media-video/vdr-1.7.27 it has been dropped entirely and some - -# plugins will fail to "compile" because they're still using the old variant. +# plugins will fail to compile because they're still using the old variant. # Simply remove the i18n.o object from Makefile (OBJECT) and # remove "static const tI18nPhrase*" from i18n.h. - -# - -# Plugins that are still using the old method will be pmasked until they're - -# fixed or in case of maintainer timeout they'll be masked for removal . gettext_missing @@ -348,6 +350,7 @@ } remove_i18n_include() { + # ToDo: rename this to vdr_...; IMPORTANT!!! We use this in the tree # remove uneeded i18.n includes local f @@ -391,6 +394,7 @@ # Plugins need to be compiled with position independent code, otherwise linking # VDR against it will fail + # depricated if fi, as we have only >=vdr-2 in the tree, fix me later... if has_version ">=media-video/vdr-1.7.13"; then append-cxxflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - -D_LARGEFILE64_SOURCE fi @@ -452,15 +456,15 @@ unpacker_src_unpack ;; add_local_patch) - - cd "${S}" || die "Could not change to plugin-source-directory!" - - if [[ ${EAPI} == 6 ]]; then + cd "${S}" || die "Could not change to plugin-source-directory (src_util)" + if [[ ${EAPI} != [45] ]]; then eapply_user else epatch_user fi ;; patchmakefile) - - cd "${S}" || die "Could not change to plugin-source-directory!" + cd "${S}" || die "Could not change to plugin-source-directory (src_util)" vdr_patchmakefile ;; i18n) @@ -500,7 +504,9 @@ die "vdr-plugin-2_src_prepare not called!" die "vdr-plugin-2_src_prepare not called!" fi - - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + [[ ${EAPI} == [45] ]] && [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@] }" + [[ ${EAPI} != [45] ]] && [[ ${PATCHES[@]} ]] && eapply "${PATCHES[@] }" + debug-print "$FUNCNAME: applying user patches" vdr-plugin-2_src_util prepare @@ -520,16 +526,14 @@ eerror "Please report this at bugs.gentoo.org." die "vdr-plugin-2_src_compile not called!" fi - - cd "${S}" + cd "${S}" || die "could not change to plugin source directory (src_compile)" - - BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all }} - - emake ${BUILD_PARAMS} \ - - ${BUILD_TARGETS} \ - - LOCALEDIR="${TMP_LOCALE_DIR}" \ - - LOCDIR="${TMP_LOCALE_DIR}" \ - - LIBDIR="${S}" \ - - TMPDIR="${T}" \ - - || die "emake failed" + emake all ${BUILD_PARAMS} \ + LOCALEDIR="${TMP_LOCALE_DIR}" \ + LOCDIR="${TMP_LOCALE_DIR}" \ + LIBDIR="${S}" \ + TMPDIR="${T}" \ + || die "emake all failed" ;; esac @@ -546,7 +550,7 @@ die "vdr-plugin-2_src_install not called!" fi - - cd "${WORKDIR}" + cd "${WORKDIR}" || die "could not change to plugin workdir directory (src_install)" if [[ -n ${VDR_MAINTAINER_MODE} ]]; then local mname="${P}-Makefile" @@ -566,16 +570,15 @@ fi - - cd "${S}" + cd "${S}" || die "could not change to plugin source directory (src_install)" local SOFILE_STRING=$(grep SOFILE Makefile) if [[ -n ${SOFILE_STRING} ]]; then - - BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-install }} - - einstall ${BUILD_PARAMS} \ - - ${BUILD_TARGETS} \ - - TMPDIR="${T}" \ - - DESTDIR="${D}" \ - - || die "einstall (makefile target) failed" + emake install \ + ${BUILD_PARAMS} \ + TMPDIR="${T}" \ + DESTDIR="${D}" \ + || die "emake install (makefile target) failed" else dev_check "Plugin use still the old Makefile handling" insinto "${VDR_PLUGIN_DIR}" @@ -584,7 +587,7 @@ if [[ -d ${TMP_LOCALE_DIR} ]]; then einfo "Installing locales" - - cd "${TMP_LOCALE_DIR}" + cd "${TMP_LOCALE_DIR}" || die "could not change to TMP_LOCALE_DI R" local linguas for linguas in ${LINGUAS[*]}; do @@ -593,7 +596,7 @@ done fi - - cd "${D}/usr/$(get_libdir)/vdr/plugins" + cd "${D}/usr/$(get_libdir)/vdr/plugins" || die "could not change to D/usr/libdir/vdr/plugins" # create list of all created plugin libs vdr_plugin_list="" @@ -604,14 +607,19 @@ vdr_plugin_list="${vdr_plugin_list} ${p_name}" done - - cd "${S}" + cd "${S}" || die "could not change to plugin source directory (src_install)" create_header_checksum_file ${vdr_plugin_list} create_plugindb_file ${vdr_plugin_list} - - local docfile - - for docfile in README* HISTORY CHANGELOG; do - - [[ -f ${docfile} ]] && dodoc ${docfile} + local commondoc=( README* HISTORY CHANGELOG ) + for docfile in "${commondoc[@]}"; do + if [[ ${EAPI} == "6" ]]; then + local DOCS="${DOCS} ${docfile}" + [[ -f ${docfile} ]] && einstalldocs "${DOCS[@]}" + else + [[ -f ${docfile} ]] && dodoc ${docfile} + fi done # if VDR_CONFD_FILE is empty and ${FILESDIR}/confd exists take it Regards /dev/joerg - -- Joerg Bornkessel GnuPG Key: 0x93EB5F4DAA5832A1 Fingerprint: 0E0A A1EE 1DF4 41D7 A3F5 21C2 93EB 5F4D AA58 32A1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.1 Comment: Signed-off-by: Jörg Bornkessel iQJ8BAEBCgBmBQJXQiLtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwRTBBQTFFRTFERjQ0MUQ3QTNGNTIxQzI5 M0VCNUY0REFBNTgzMkExAAoJEJPrX02qWDKhQXcP/jNRQr/6Q5Jb6UEvR8pSXI52 Xgl33SMwVtN8eckVYBH3E/xwV82QhJ3QnPqGasFPdnOT/fZBw9rHP8fHCrW+lXlg LcGicaEgWj7ZuE77PA4Vo44LrAhL2DHgLSnU20BPvOaDtVBY9bwTQPuzTzfg0mrz kNo1eJPh8Ptsqn89AJqegs14uRulrYAMsQVNty/X7vkZxv237J0lhqN+wNoJRpON NisWqPJl2ENq1fZaLakCneC9ghjeJytu8+5YNTW5fjfAAWcyXMIjtxgIcjBZb/TE jAek3uJhivDfykRq9v07G+s125kNel48cK6tR09A24JTtzW4govA+0p7P+KYVt38 bLxFGqgNEkevFgZ9w8y0zg3keYo6sjTWcijmQ1InXX9Yn4NgbiabX2Xh2i4OAbNS g0E9TGUZ+MGhCgq2PC8BRPgzPMyCsq1iZM4C1Q3zVvFyj6AF2Hh6kRUMXVHyUhUi BERo2xZNr9WZFki6yXASKVvpUNbWbuhtyk21Wo7rPr+yBhx0zTNjnAMglTWJ1FQE N0xNp9EDUkU18OgRiNgYi57a2shf9xxYULKBFowUVeJ6t4DlYUx9HnTmaVR9F4HI 1xzUIVjkA2LU2Vx57DGZV3ZwjyVca/OfbwiTmNr/J0e25oIVseH4exUBYlaucuM0 JResc4NvRm6T+uLS6g9x =o4K0 -----END PGP SIGNATURE----- --------------060205030201090704030704 Content-Type: text/plain; charset=UTF-8; name="vdr-plugin-2.eclass.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="vdr-plugin-2.eclass.diff" LS0tIHZkci1wbHVnaW4tMi5lY2xhc3MJMjAxNi0wNS0yMiAyMjoyNzoxMi4wODE5NTY2NjAg KzAyMDAKKysrIHZkci1wbHVnaW4tMi5lY2xhc3MubmV3CTIwMTYtMDUtMjIgMjM6MTA6MTEu OTA4NDA0OTM5ICswMjAwCkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgMTk5OS0yMDE1 IEdlbnRvbyBGb3VuZGF0aW9uCisjIENvcHlyaWdodCAxOTk5LTIwMTYgR2VudG9vIEZvdW5k YXRpb24KICMgRGlzdHJpYnV0ZWQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJh bCBQdWJsaWMgTGljZW5zZSB2MgogIyAkSWQkCiAKQEAgLTkwLDcgKzkwLDcgQEAKICMgQENP REUKIAogIyBBcHBseWluZyB5b3VyIG93biBsb2NhbC91c2VyIHBhdGNoZXM6Ci0jIFRoaXMg aXMgZG9uZSBieSB1c2luZyB0aGUgCisjIFRoaXMgaXMgZG9uZSBieSB1c2luZyB0aGUKICMg KEVBUEkgPSA0LDUpIGVwYXRjaF91c2VyKCkgZnVuY3Rpb24gb2YgdGhlIGV1dGlscy5lY2xh c3MsCiAjIChFQVBJID0gNikgZWFwcGx5X3VzZXIgZnVuY3Rpb24gaW50ZWdyYXRlZCBpbiBF QVBJID0gNi4KICMgU2ltcGx5IGFkZCB5b3VyIHBhdGNoZXMgaW50byBvbmUgb2YgdGhlc2Ug ZGlyZWN0b3JpZXM6CkBAIC0xMDQsMTAgKzEwNCw3IEBACiBpbmhlcml0IGZsYWctby1tYXRp YyB0b29sY2hhaW4tZnVuY3MgdW5wYWNrZXIKIAogY2FzZSAke0VBUEk6LTB9IGluCi0JNHw1 KQotCTs7Ci0JNikKLQlld2FybiAiRUFQSSA2IHN1cHBvcnQgZm9yIHRlc3QgcHVycG9zZSBv bmx5LCBwbHogcmVwb3J0IGJ1Z3MgdG8gdmRyQGdlbnRvby5vcmciCisJNHw1fDYpCiAJOzsK IAkqKSBkaWUgIkVBUEkgJHtFQVBJfSB1bnN1cHBvcnRlZC4iCiAJOzsKQEAgLTE0NSw2ICsx NDIsNyBAQAogIyAgIENhbGxlZCBmcm9tIHNyY19pbnN0YWxsCiAjICAgZmlsZSBtYWludGFp bmVkIGJ5IG5vcm1hbCBwb3J0YWdlLW1ldGhvZHMKIGNyZWF0ZV9wbHVnaW5kYl9maWxlKCkg eworCSNUb0RvOiByZW5hbWUgdGhpcyB0byB2ZHJfLi4uCiAJbG9jYWwgTkVXX1ZEUlBMVUdJ TkRCX0RJUj0vdXNyL3NoYXJlL3Zkci92ZHJwbHVnaW4tcmVidWlsZC8KIAlsb2NhbCBEQl9G SUxFPSIke05FV19WRFJQTFVHSU5EQl9ESVJ9LyR7Q0FURUdPUll9LSR7UEZ9IgogCWluc2lu dG8gIiR7TkVXX1ZEUlBMVUdJTkRCX0RJUn0iCkBAIC0xNTYsNiArMTU0LDcgQEAKICMJCUVC VUlMRD0ke0NBVEVHT1JZfS8ke1BOfQogIwkJRUJVSUxEX1Y9JHtQVlJ9CiAjCUVPVAorIwlv YnNvbGV0PyBmaXggbWUgbGF0ZXIuLi4KIAl7CiAJCWVjaG8gIlZEUlBMVUdJTl9EQj0xIgog CQllY2hvICJDUkVBVE9SPUVDTEFTUyIKQEAgLTE2Niw2ICsxNjUsNyBAQAogfQogCiBjcmVh dGVfaGVhZGVyX2NoZWNrc3VtX2ZpbGUoKSB7CisJI1RvRG86IHJlbmFtZSB0aGlzIHRvIHZk cl8uLi4KIAkjIERhbmdlcjogTm90IHVzaW5nICRST09UIGhlcmUsIGFzIGNvbXBpbGUgd2ls bCBhbHNvIG5vdCB1c2UgaXQgISEhCiAJIyBJZiB2ZHIgaW4gJFJPT1QgYW5kIC8gZGlmZmVy LCBwbHVnaW5zIHdpbGwgbm90IHJ1biBhbnl3YXkKIApAQCAtMjMyLDYgKzIzMiw3IEBACiAJ I3NlZCAtaSBNYWtlZmlsZSBcCiAJIwktZSAiczpeRFZCRElSLiokOkRWQkRJUiA9ICR7RFZC X0lOQ0xVREVfRElSfToiIFwKIAkjCS1lICdzOi1JJChEVkJESVIpL2luY2x1ZGU6LUkkKERW QkRJUik6JworCSMgb2Jzb2xldD8gZml4IG1lIGxhdGVyLi4uCiAKIAlpZiAhIGdyZXAgLXEg QVBJVkVSU0lPTiBNYWtlZmlsZTsgdGhlbgogCQllYmVnaW4gIiAgQ29udmVydGluZyB0byBB UElWRVJTSU9OIgpAQCAtMjYwLDYgKzI2MSw3IEBACiB9CiAKIGRldl9jaGVjaygpIHsKKwkj IFRvRG86IHJlbmFtZSB0aGlzIHRvIHZkcl8uLi47IElNUE9SVEFOVDogY2hlY2sgYXZhaWxh YmVsIHBsdWdpbnMsIGlmIHdlIHVzZSB0aGlzIGZ1bmN0aW9uIGluIHRoZSB0cmVlLi4uCiAJ IyBBIGxvdCB1c2VmdWwgZGVidWcgaW5mb3MKIAkjIHNldCBWRFJfTUFJTlRBSU5FUl9NT0RF PSIxIiBpbiBtYWtlLmNvbmYKIAlpZiBbWyAtbiAke1ZEUl9NQUlOVEFJTkVSX01PREV9IF1d OyB0aGVuCkBAIC0yNjgsNiArMjcwLDcgQEAKIH0KIAogZ2V0dGV4dF9taXNzaW5nKCkgewor CSNUb0RvOiByZW1hbmUgdGhpcyB0byB2ZHJfLi4uCiAJIyBwbHVnaW5zIHdpdGhvdXQgY29u dmVydGluZyB0byBnZXR0ZXh0CiAKIAlsb2NhbCBHRVRURVhUX01JU1NJTkc9JCggZ3JlcCB4 Z2V0dGV4dCBNYWtlZmlsZSApCkBAIC0yNzcsNiArMjgwLDcgQEAKIH0KIAogZGV0ZWN0X3Bv X2RpcigpIHsKKwkjIFRvRG86IHJlbWFuZSB0aGlzIHRvIHZkcl8uLi4KIAkjIGhlbHBlciBm dW5jdGlvbgogCiAJW1sgLWYgcG8gXV0gJiYgbG9jYWwgcG9fZGlyPSIke1N9IgpAQCAtMjg3 LDkgKzI5MSwxMCBAQAogfQogCiBsaW5ndWFzX3N1cHBvcnQoKSB7CisJIyBUb0RvOiByZW1h bmUgdGhpcyB0byB2ZHJfLi4uCiAjCVBhdGNoaW5nIE1ha2VmaWxlIGZvciBsaW5ndWFzIHN1 cHBvcnQuCiAjCU9ubHkgbG9jYWxlcywgZW5hYmxlZCB0aHJvdWdoIHRoZSBMSU5HVUFTICht YWtlLmNvbmYpIHZhcmlhYmxlIHdpbGwgYmUKLSMJImNvbXBpbGVkIiBhbmQgaW5zdGFsbGVk LgorIwljb21waWxlZCBhbmQgaW5zdGFsbGVkLgogCiAJZWluZm8gIlBhdGNoaW5nIGZvciBM aW5ndWFzIHN1cHBvcnQiCiAJZWluZm8gImF2YWlsYWJsZSBMYW5ndWFnZXMgZm9yICR7UH0g YXJlOiIKQEAgLTMxMSwxMiArMzE2LDkgQEAKIHZkcl9pMThuKCkgewogIyAJaTE4biBoYW5k bGluZyB3YXMgZGVwcmVjYXRlZCBzaW5jZSA+PW1lZGlhLXZpZGVvL3Zkci0xLjUuOSwKICMJ ZmluYWxseSB3aXRoID49bWVkaWEtdmlkZW8vdmRyLTEuNy4yNyBpdCBoYXMgYmVlbiBkcm9w cGVkIGVudGlyZWx5IGFuZCBzb21lCi0jCXBsdWdpbnMgd2lsbCBmYWlsIHRvICJjb21waWxl IiBiZWNhdXNlIHRoZXkncmUgc3RpbGwgdXNpbmcgdGhlIG9sZCB2YXJpYW50LgorIwlwbHVn aW5zIHdpbGwgZmFpbCB0byBjb21waWxlIGJlY2F1c2UgdGhleSdyZSBzdGlsbCB1c2luZyB0 aGUgb2xkIHZhcmlhbnQuCiAjCVNpbXBseSByZW1vdmUgdGhlIGkxOG4ubyBvYmplY3QgZnJv bSBNYWtlZmlsZSAoT0JKRUNUKSBhbmQKICMJcmVtb3ZlICJzdGF0aWMgY29uc3QgdEkxOG5Q aHJhc2UqIiBmcm9tIGkxOG4uaC4KLSMKLSMJUGx1Z2lucyB0aGF0IGFyZSBzdGlsbCB1c2lu ZyB0aGUgb2xkIG1ldGhvZCB3aWxsIGJlIHBtYXNrZWQgdW50aWwgdGhleSdyZQotIwlmaXhl ZCBvciBpbiBjYXNlIG9mIG1haW50YWluZXIgdGltZW91dCB0aGV5J2xsIGJlIG1hc2tlZCBm b3IgcmVtb3ZhbC4KIAogCWdldHRleHRfbWlzc2luZwogCkBAIC0zNDgsNiArMzUwLDcgQEAK IH0KIAogcmVtb3ZlX2kxOG5faW5jbHVkZSgpIHsKKwkjIFRvRG86IHJlbmFtZSB0aGlzIHRv IHZkcl8uLi47IElNUE9SVEFOVCEhISBXZSB1c2UgdGhpcyBpbiB0aGUgdHJlZQogCSMgcmVt b3ZlIHVuZWVkZWQgaTE4Lm4gaW5jbHVkZXMKIAogCWxvY2FsIGYKQEAgLTM5MSw2ICszOTQs NyBAQAogCiAJIyBQbHVnaW5zIG5lZWQgdG8gYmUgY29tcGlsZWQgd2l0aCBwb3NpdGlvbiBp bmRlcGVuZGVudCBjb2RlLCBvdGhlcndpc2UgbGlua2luZwogCSMgVkRSIGFnYWluc3QgaXQg d2lsbCBmYWlsCisJIyBkZXByaWNhdGVkIGlmIGZpLCBhcyB3ZSBoYXZlIG9ubHkgPj12ZHIt MiBpbiB0aGUgdHJlZSwgZml4IG1lIGxhdGVyLi4uCiAJaWYgaGFzX3ZlcnNpb24gIj49bWVk aWEtdmlkZW8vdmRyLTEuNy4xMyI7IHRoZW4KIAkJYXBwZW5kLWN4eGZsYWdzIC1EX0ZJTEVf T0ZGU0VUX0JJVFM9NjQgLURfTEFSR0VGSUxFX1NPVVJDRSAtRF9MQVJHRUZJTEU2NF9TT1VS Q0UKIAlmaQpAQCAtNDUyLDE1ICs0NTYsMTUgQEAKIAkJCXVucGFja2VyX3NyY191bnBhY2sK IAkJCTs7CiAJCWFkZF9sb2NhbF9wYXRjaCkKLQkJCWNkICIke1N9IiB8fCBkaWUgIkNvdWxk IG5vdCBjaGFuZ2UgdG8gcGx1Z2luLXNvdXJjZS1kaXJlY3RvcnkhIgotCQkJaWYgW1sgJHtF QVBJfSA9PSA2IF1dOyB0aGVuCisJCQljZCAiJHtTfSIgfHwgZGllICJDb3VsZCBub3QgY2hh bmdlIHRvIHBsdWdpbi1zb3VyY2UtZGlyZWN0b3J5IChzcmNfdXRpbCkiCisJCQlpZiBbWyAk e0VBUEl9ICE9IFs0NV0gXV07IHRoZW4KIAkJCQllYXBwbHlfdXNlcgogCQkJZWxzZQogCQkJ CWVwYXRjaF91c2VyCiAJCQlmaQogCQkJOzsKIAkJcGF0Y2htYWtlZmlsZSkKLQkJCWNkICIk e1N9IiB8fCBkaWUgIkNvdWxkIG5vdCBjaGFuZ2UgdG8gcGx1Z2luLXNvdXJjZS1kaXJlY3Rv cnkhIgorCQkJY2QgIiR7U30iIHx8IGRpZSAiQ291bGQgbm90IGNoYW5nZSB0byBwbHVnaW4t c291cmNlLWRpcmVjdG9yeSAoc3JjX3V0aWwpIgogCQkJdmRyX3BhdGNobWFrZWZpbGUKIAkJ CTs7CiAJCWkxOG4pCkBAIC01MDAsNyArNTA0LDkgQEAKIAkJZGllICJ2ZHItcGx1Z2luLTJf c3JjX3ByZXBhcmUgbm90IGNhbGxlZCEiCiAJZmkKIAotCVtbICR7UEFUQ0hFU1tAXX0gXV0g JiYgZXBhdGNoICIke1BBVENIRVNbQF19IgorCVtbICR7RUFQSX0gPT0gWzQ1XSBdXSAmJiBb WyAke1BBVENIRVNbQF19IF1dICYmIGVwYXRjaCAiJHtQQVRDSEVTW0BdfSIKKwlbWyAke0VB UEl9ICE9IFs0NV0gXV0gJiYgW1sgJHtQQVRDSEVTW0BdfSBdXSAmJiBlYXBwbHkgIiR7UEFU Q0hFU1tAXX0iCisKIAlkZWJ1Zy1wcmludCAiJEZVTkNOQU1FOiBhcHBseWluZyB1c2VyIHBh dGNoZXMiCiAKIAl2ZHItcGx1Z2luLTJfc3JjX3V0aWwgcHJlcGFyZQpAQCAtNTIwLDE2ICs1 MjYsMTQgQEAKIAkJCQllZXJyb3IgIlBsZWFzZSByZXBvcnQgdGhpcyBhdCBidWdzLmdlbnRv by5vcmcuIgogCQkJCWRpZSAidmRyLXBsdWdpbi0yX3NyY19jb21waWxlIG5vdCBjYWxsZWQh IgogCQkJZmkKLQkJCWNkICIke1N9IgorCQkJY2QgIiR7U30iIHx8IGRpZSAiY291bGQgbm90 IGNoYW5nZSB0byBwbHVnaW4gc291cmNlIGRpcmVjdG9yeSAoc3JjX2NvbXBpbGUpIgogCi0J CQlCVUlMRF9UQVJHRVRTPSR7QlVJTERfVEFSR0VUUzotJHtWRFJQTFVHSU5fTUFLRV9UQVJH RVQ6LWFsbCB9fQotCQkJCWVtYWtlICR7QlVJTERfUEFSQU1TfSBcCi0JCQkJCSR7QlVJTERf VEFSR0VUU30gXAotCQkJCQlMT0NBTEVESVI9IiR7VE1QX0xPQ0FMRV9ESVJ9IiBcCi0JCQkJ CUxPQ0RJUj0iJHtUTVBfTE9DQUxFX0RJUn0iIFwKLQkJCQkJTElCRElSPSIke1N9IiBcCi0J CQkJCVRNUERJUj0iJHtUfSIgXAotCQkJCQl8fCBkaWUgImVtYWtlIGZhaWxlZCIKKwkJCWVt YWtlIGFsbCAke0JVSUxEX1BBUkFNU30gXAorCQkJCUxPQ0FMRURJUj0iJHtUTVBfTE9DQUxF X0RJUn0iIFwKKwkJCQlMT0NESVI9IiR7VE1QX0xPQ0FMRV9ESVJ9IiBcCisJCQkJTElCRElS PSIke1N9IiBcCisJCQkJVE1QRElSPSIke1R9IiBcCisJCQkJfHwgZGllICJlbWFrZSBhbGwg ZmFpbGVkIgogCQkJOzsKIAkJZXNhYwogCkBAIC01NDYsNyArNTUwLDcgQEAKIAkJZGllICJ2 ZHItcGx1Z2luLTJfc3JjX2luc3RhbGwgbm90IGNhbGxlZCEiCiAJZmkKIAotCWNkICIke1dP UktESVJ9IgorCWNkICIke1dPUktESVJ9IiB8fCBkaWUgImNvdWxkIG5vdCBjaGFuZ2UgdG8g cGx1Z2luIHdvcmtkaXIgZGlyZWN0b3J5IChzcmNfaW5zdGFsbCkiCiAKIAlpZiBbWyAtbiAk e1ZEUl9NQUlOVEFJTkVSX01PREV9IF1dOyB0aGVuCiAJCWxvY2FsIG1uYW1lPSIke1B9LU1h a2VmaWxlIgpAQCAtNTY2LDE2ICs1NzAsMTUgQEAKIAogCWZpCiAKLQljZCAiJHtTfSIKKwlj ZCAiJHtTfSIgfHwgZGllICJjb3VsZCBub3QgY2hhbmdlIHRvIHBsdWdpbiBzb3VyY2UgZGly ZWN0b3J5IChzcmNfaW5zdGFsbCkiCiAKIAlsb2NhbCBTT0ZJTEVfU1RSSU5HPSQoZ3JlcCBT T0ZJTEUgTWFrZWZpbGUpCiAJaWYgW1sgLW4gJHtTT0ZJTEVfU1RSSU5HfSBdXTsgdGhlbgot CQlCVUlMRF9UQVJHRVRTPSR7QlVJTERfVEFSR0VUUzotJHtWRFJQTFVHSU5fTUFLRV9UQVJH RVQ6LWluc3RhbGwgfX0KLQkJZWluc3RhbGwgJHtCVUlMRF9QQVJBTVN9IFwKLQkJCSR7QlVJ TERfVEFSR0VUU30gXAotCQkJVE1QRElSPSIke1R9IiBcCi0JCQlERVNURElSPSIke0R9IiBc Ci0JCQl8fCBkaWUgImVpbnN0YWxsIChtYWtlZmlsZSB0YXJnZXQpIGZhaWxlZCIKKwkJZW1h a2UgaW5zdGFsbCBcCisJCSR7QlVJTERfUEFSQU1TfSBcCisJCVRNUERJUj0iJHtUfSIgXAor CQlERVNURElSPSIke0R9IiBcCisJCXx8IGRpZSAiZW1ha2UgaW5zdGFsbCAobWFrZWZpbGUg dGFyZ2V0KSBmYWlsZWQiCiAJZWxzZQogCQlkZXZfY2hlY2sgIlBsdWdpbiB1c2Ugc3RpbGwg dGhlIG9sZCBNYWtlZmlsZSBoYW5kbGluZyIKIAkJaW5zaW50byAiJHtWRFJfUExVR0lOX0RJ Un0iCkBAIC01ODQsNyArNTg3LDcgQEAKIAogCWlmIFtbIC1kICR7VE1QX0xPQ0FMRV9ESVJ9 IF1dOyB0aGVuCiAJCWVpbmZvICJJbnN0YWxsaW5nIGxvY2FsZXMiCi0JCWNkICIke1RNUF9M T0NBTEVfRElSfSIKKwkJY2QgIiR7VE1QX0xPQ0FMRV9ESVJ9IiB8fCBkaWUgImNvdWxkIG5v dCBjaGFuZ2UgdG8gVE1QX0xPQ0FMRV9ESVIiCiAKIAkJbG9jYWwgbGluZ3VhcwogCQlmb3Ig bGluZ3VhcyBpbiAke0xJTkdVQVNbKl19OyBkbwpAQCAtNTkzLDcgKzU5Niw3IEBACiAJCWRv bmUKIAlmaQogCi0JY2QgIiR7RH0vdXNyLyQoZ2V0X2xpYmRpcikvdmRyL3BsdWdpbnMiCisJ Y2QgIiR7RH0vdXNyLyQoZ2V0X2xpYmRpcikvdmRyL3BsdWdpbnMiIHx8IGRpZSAiY291bGQg bm90IGNoYW5nZSB0byBEL3Vzci9saWJkaXIvdmRyL3BsdWdpbnMiCiAKIAkjIGNyZWF0ZSBs aXN0IG9mIGFsbCBjcmVhdGVkIHBsdWdpbiBsaWJzCiAJdmRyX3BsdWdpbl9saXN0PSIiCkBA IC02MDQsMTQgKzYwNywxOSBAQAogCQl2ZHJfcGx1Z2luX2xpc3Q9IiR7dmRyX3BsdWdpbl9s aXN0fSAke3BfbmFtZX0iCiAJZG9uZQogCi0JY2QgIiR7U30iCisJY2QgIiR7U30iIHx8IGRp ZSAiY291bGQgbm90IGNoYW5nZSB0byBwbHVnaW4gc291cmNlIGRpcmVjdG9yeSAoc3JjX2lu c3RhbGwpIgogCiAJY3JlYXRlX2hlYWRlcl9jaGVja3N1bV9maWxlICR7dmRyX3BsdWdpbl9s aXN0fQogCWNyZWF0ZV9wbHVnaW5kYl9maWxlICR7dmRyX3BsdWdpbl9saXN0fQogCi0JbG9j YWwgZG9jZmlsZQotCWZvciBkb2NmaWxlIGluIFJFQURNRSogSElTVE9SWSBDSEFOR0VMT0c7 IGRvCi0JCVtbIC1mICR7ZG9jZmlsZX0gXV0gJiYgZG9kb2MgJHtkb2NmaWxlfQorCWxvY2Fs IGNvbW1vbmRvYz0oIFJFQURNRSogSElTVE9SWSBDSEFOR0VMT0cgKQorCWZvciBkb2NmaWxl IGluICIke2NvbW1vbmRvY1tAXX0iOyBkbworCQlpZiBbWyAke0VBUEl9ID09ICI2IiBdXTsg dGhlbgorCQkJbG9jYWwgRE9DUz0iJHtET0NTfSAke2RvY2ZpbGV9IgorCQkJW1sgLWYgJHtk b2NmaWxlfSBdXSAmJiBlaW5zdGFsbGRvY3MgIiR7RE9DU1tAXX0iCisJCWVsc2UKKwkJCVtb IC1mICR7ZG9jZmlsZX0gXV0gJiYgZG9kb2MgJHtkb2NmaWxlfQorCQlmaQogCWRvbmUKIAog CSMgaWYgVkRSX0NPTkZEX0ZJTEUgaXMgZW1wdHkgYW5kICR7RklMRVNESVJ9L2NvbmZkIGV4 aXN0cyB0YWtlIGl0Cg== --------------060205030201090704030704--