From f246485bf244cb770dfd57f48098af75faea552e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Tue, 24 Aug 2021 23:17:20 +0200 Subject: Merge {groups,vars}/ w/ extended ${PKG_INSTALL_V2} DSL. files/{autoconf_2_64_host,busybox,install_strip_host,libxml2,pkgconf,{pkgconf,python2,rpm,texinfo}_host}/*, etc/{busyboxconfig,python2.7-config}: added/moved. groups/000.host_tools.group:auto{conf_2_64,make_1_11_6}_host:${PKG_INSTALL_FILES_V2}: merged. groups/000.host_tools.group:install_strip_host:${PKG_BUILD_STEPS_DISABLE}: disable "build install_make install_rpm". groups/000.host_tools.group:install_strip_host:${PKG_INSTALL_FILES_V2}: merged. groups/000.host_tools.group:pkgconf_host:${PKG_INSTALL_FILES_V2}: merged. groups/010.host_deps.group:chainport_host:${PKG_BUILD_STEPS_DISABLE}: disable "build install_make install_rpm". groups/010.host_deps.group:chainport_host:${PKG_PREFIX}: removed. groups/010.host_deps.group:{chainport,clzip,cmake,dbus,libffi,libzip,mdso,ncursesw,perk,python[23],texinfo,tzdb}_host:${PKG_INSTALL_FILES_V2}: merged/updated. groups/020.host_deps_rpm.group:rpm_host:${PKG_INSTALL_FILES_V2}: merged. groups/030.host_toolchain.group:{binutils,ldso,nasm}_host:${PKG_INSTALL_FILES_V2}: merged/updated. groups/100.native_tools.group:{mdso,perk,pkgconf}:${PKG_INSTALL_FILES_V2}: merged. groups/110.native_toolchain.group:binutils:${PKG_INSTALL_FILES_V2}: merged. groups/120.native_runtime.group:{ldso,ntux,psxscl_strace}:${PKG_INSTALL_FILES_V2}: updated. groups/211.native_packages_cmdline.group:{busybox,dash.dos2unix,mksh,ninvaders,openbsd_baseutils,pixz,tree,terminally_tetris}:${PKG_INSTALL_FILES_V2}: merged/updated. groups/221.native_packages_dev.group:{gdb,lua,python3}:${PKG_INSTALL_FILES_V2}: updated. groups/231.native_packages_etc.group:{apr_util,bochs,bzip2,clzip,doomgeneric,hastyhex,john,ncursesw,p7zip,vim}:${PKG_INSTALL_FILES_V2}: updated. groups/251.native_packages_lib.group:{lib{ffi,jpeg_turbo,solv,ssh,xml2,zip},nettle,wolfssl}:${PKG_INSTALL_FILES_V2}: merged/updated. groups/251.native_packages_lib.group:nettle:${PKG_CONFIG_CACHE_EXTRA}: merged. groups/261.native_packages_x11.group:{glew,st}:${PKG_INSTALL_FILES_V2}: updated. groups/800.minipix.group:{bash,bzip2,dash,dropbear}_minipix:${PKG_INSTALL_FILES_V2}: updated. vars/{{autoconf_2_64,automake_1_11_6,chainport,dbus,install_strip,nasm,pkgconf,rpm,texinfo,tzdb}_host,nettle,pkgconf{,_host}}.vars: deleted. --- vars/autoconf_2_64_host.vars | 54 ------------------------------------------ vars/automake_1_11_6_host.vars | 29 ----------------------- vars/binutils.vars | 7 ------ vars/busybox.vars | 9 ------- vars/chainport_host.vars | 12 ---------- vars/dbus_host.vars | 9 ------- vars/install_strip_host.vars | 24 ------------------- vars/nasm_host.vars | 14 ----------- vars/nettle.vars | 16 ------------- vars/pkgconf.vars | 1 - vars/pkgconf_host.vars | 40 ------------------------------- vars/rpm_host.vars | 13 ---------- vars/texinfo_host.vars | 23 ------------------ vars/tzdb_host.vars | 9 ------- 14 files changed, 260 deletions(-) delete mode 100644 vars/autoconf_2_64_host.vars delete mode 100644 vars/automake_1_11_6_host.vars delete mode 100644 vars/chainport_host.vars delete mode 100644 vars/dbus_host.vars delete mode 100644 vars/install_strip_host.vars delete mode 100644 vars/nasm_host.vars delete mode 100644 vars/nettle.vars delete mode 120000 vars/pkgconf.vars delete mode 100644 vars/pkgconf_host.vars delete mode 100644 vars/rpm_host.vars delete mode 100644 vars/texinfo_host.vars delete mode 100644 vars/tzdb_host.vars (limited to 'vars') diff --git a/vars/autoconf_2_64_host.vars b/vars/autoconf_2_64_host.vars deleted file mode 100644 index 31166de1..00000000 --- a/vars/autoconf_2_64_host.vars +++ /dev/null @@ -1,54 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -: ${PKG_AUTOCONF_2_64_HOST_INSTALL_FILES:=" \ - /=libexec/autoconf-2.64 \ - !bin/autoconf=libexec/autoconf-2.64/ \ - !bin/autoheader=libexec/autoconf-2.64/ \ - !bin/autom4te=libexec/autoconf-2.64/ \ - !bin/autoreconf=libexec/autoconf-2.64/ \ - !bin/autoscan=libexec/autoconf-2.64/ \ - !bin/autoupdate=libexec/autoconf-2.64/ \ - !bin/ifnames=libexec/autoconf-2.64/ \ - !share/autoconf-2.64/autom4te.cfg=share/autoconf/ \ - -share/autoconf-2.64/ \ - !share/autoconf=share/autoconf-2.64/ \ - -share/info/dir \ - !share/info/autoconf.info=share/info/autoconf-2.64.info \ - !share/info/standards.info=share/info/standards-2.64.info \ - !share/man/man1/autoconf.1=share/man/man1/autoconf-2.64.1 \ - !share/man/man1/autoheader.1=share/man/man1/autoheader-2.64.1 \ - !share/man/man1/autom4te.1=share/man/man1/autom4te-2.64.1 \ - !share/man/man1/autoreconf.1=share/man/man1/autoreconf-2.64.1 \ - !share/man/man1/autoscan.1=share/man/man1/autoscan-2.64.1 \ - !share/man/man1/autoupdate.1=share/man/man1/autoupdate-2.64.1 \ - !share/man/man1/config.guess.1=share/man/man1/config.guess-2.64.1 \ - !share/man/man1/config.sub.1=share/man/man1/config.sub-2.64.1 \ - !share/man/man1/ifnames.1=share/man/man1/ifnames-2.64.1 \ -"}; - -pkg_autoconf_2_64_host_install_files_post() { - local _bin_fname="" _fname=""; - - for _bin_fname in $(find "${PKG_DESTDIR}/libexec/autoconf-${PKG_VERSION}" -type f -perm /0111); do - cat >"${PKG_DESTDIR}/bin/${_bin_fname##*/}-${PKG_VERSION}" < "${PREFIX}/bin/${PKG_TARGET}-install-strip" < "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" < "${PKG_DESTDIR}/lib/rpm/elfdeps"\ - || ! rtl_fileop chmod +x "${PKG_DESTDIR}/lib/rpm/elfdeps"\ - || ! rtl_fileop rm "${PKG_DESTDIR}/var"; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/texinfo_host.vars b/vars/texinfo_host.vars deleted file mode 100644 index 12795622..00000000 --- a/vars/texinfo_host.vars +++ /dev/null @@ -1,23 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_texinfo_host_install_make_post() { - if [ -e "${PKG_DESTDIR}/bin/makeinfo" ]; then - if ! rtl_fileop mv "${PKG_DESTDIR}/bin/makeinfo" "${PKG_DESTDIR}/bin/makeinfo.dist"; then - return 1; - fi; - fi; - if ! cat > "${PKG_DESTDIR}/bin/makeinfo" <