From 331deb6f803ded7fda849559f1381098de00a1ed Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sun, 2 Dec 2012 23:49:06 +0100 Subject: [PATCH] correct some typos Package-Manager: portage-2.2.0_alpha142 RepoMan-Options: --force --- sys-kernel/recoveryinitramfs/Manifest | 2 +- .../recoveryinitramfs-2012.12.01.ebuild | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys-kernel/recoveryinitramfs/Manifest b/sys-kernel/recoveryinitramfs/Manifest index 7cd3192..7bbfa74 100644 --- a/sys-kernel/recoveryinitramfs/Manifest +++ b/sys-kernel/recoveryinitramfs/Manifest @@ -33,4 +33,4 @@ DIST termcap-1.3.1.tar.gz 439416 SHA256 91a0e22e5387ca4467b5bcb18edf1c51b930262f DIST termtypes.tc.gz 228329 SHA256 c4fa04257fea6e968d4caa28cc18dbbf9eea4769a463296eaca21ceea757a728 SHA512 13a2ee2cd0bc349d69af7efb8e8122f655b67f4bcbe0dc5cbf8a9ba22649548086a097de8bc148fb71ceba1640434a6b94763410beb3b915e03c3a6b46e8a678 WHIRLPOOL ee07db90257172a651e067e5313b2c9240b6a4cb60f376fd699f70ae95d20c1c7ed36cdb954259b21ecd48b7f997fe67f1be6ab5555ce8bdc3f65f7f3d6fa18f DIST xfsprogs-3.1.8.tar.gz 1399333 SHA256 74409e2e3748074999df25c00f722621659a0bd3607e677f0bcc4373b8c93eab SHA512 55f325e2284a88f21f05b8a836b654de16109e509315b9f443888331e7f63bdf4bbd749643d7879c8007b95b98c7ff0a6574bb1e8cf809abe481b7584466524a WHIRLPOOL d637b01c68e3673a2b70f271068c63ad83bb18cd47252ee190204fcb94b103c513612f7111346c8eb6194d4043a236cc6ab5c1b94e4d4175ed7f34231e759601 DIST zlib-1.2.7.tar.gz 560351 SHA256 fa9c9c8638efb8cb8ef5e4dd5453e455751e1c530b1595eed466e1be9b7e26c5 SHA512 b1c073ad26684e354f7c522c14655840592e03872bc0a94690f89cae2ff88f146fce1dad252ff27a889dac4a32ff9f8ab63ba940671f9da89e9ba3e19f1bf58d WHIRLPOOL 2f0bc05a9c14033adc33cdd14d1dce72a57c650304692141a89af26274b62ffa67d09afbc68562d07279f80e214e396b357f20094ecf4b9576bc200cafa01a6d -EBUILD recoveryinitramfs-2012.12.01.ebuild 7261 SHA256 44c958191d6a922a7255bdd2242bfef006f3819a4450052280486a28d5b1ffae SHA512 609dbd25bae6f174bf773a3dd77618815c699e17552d2946632cbff5ab97073fcb0dfc476da3b337aaea99284ff3ad096ac85b0e1bb1667585b8a05e4ba47560 WHIRLPOOL 6e1d3af4306ceb77372924ce0abe41115a87e5fbc47d84cac24561fe7da22d3303c21a3ada34fce5f2bf44fe47fb21468cf5c7d807a107da6febd35cd3718547 +EBUILD recoveryinitramfs-2012.12.01.ebuild 7644 SHA256 d9c7545d8a1d42cc3f86aa1c2e5e89c81186ff97824daca445c922ffd5bb3df8 SHA512 1f7df7517f4dec147d0ec780a89df915025624316b256e16568b0934e3535bda45b9684d99fe3c24e075e2ecb13a4aca271652138f0a094a25adb959b08a9722 WHIRLPOOL 9ecebbcda39e463d1160e121a665728b2cecc2ce3a84c7b5adc6f6fabfc35f25ad59f0727d13034bc4e48ac5bb89216692c22901c971f16668634b6e2a71c312 diff --git a/sys-kernel/recoveryinitramfs/recoveryinitramfs-2012.12.01.ebuild b/sys-kernel/recoveryinitramfs/recoveryinitramfs-2012.12.01.ebuild index ac27b3c..50eec71 100644 --- a/sys-kernel/recoveryinitramfs/recoveryinitramfs-2012.12.01.ebuild +++ b/sys-kernel/recoveryinitramfs/recoveryinitramfs-2012.12.01.ebuild @@ -124,6 +124,8 @@ src_compile() { export CXX=${CHOST/-*/}-linux-musl-g++ export LD_LIBRARY_PATH="${DDIR}/lib:${DDIR}/${CHOST/-*/}-linux-musl/${CHOST/-*/}-linux-musl/lib64:${DDIR}/${CHOST/-*/}-linux-musl/${CHOST/-*/}-linux-musl/lib" export LDFLAGS="-L${DDIR}/lib" + export CFLAGS="-I${DDIR}/include" + export CPPFLAGS="-I${DDIR}/include" popd # configure compile install musl libc for later use @@ -141,6 +143,7 @@ src_compile() { popd # configure compile install termcap for later use + # ncurses would be to much for the initramfs so just termcap pushd ${WORKDIR}/termcap-${VERSION_TERMCAP} ./configure --prefix=${DDIR} --host="${CHOST/-*/}-linux-musl" --build="${CHOST/-*/}-linux-musl" emake @@ -149,7 +152,7 @@ src_compile() { # configure compile install readline for later use pushd ${WORKDIR}/readline-${VERSION_READLINE} - ./configure --prefix="${DDIR}" --host="${CHOST/-*/}-linux-musl" --build="${CHOST/-*/}-linux-musl" + LIBS="-ltermcap" ./configure --prefix="${DDIR}" --host="${CHOST/-*/}-linux-musl" --build="${CHOST/-*/}-linux-musl" emake emake install popd @@ -163,7 +166,9 @@ src_compile() { # configure compile install sftpserver pushd ${WORKDIR}/sftpserver-${VERSION_SFTPSERVER} - LIBS="-lreadline -liconv" ./configure --prefix="${DDIR}" --enable-reversed-symlink --host="${CHOST/-*/}-linux-musl" --build="${CHOST/-*/}-linux-musl" + # great autodetect not working so overwrite libs to link + LIBS="-lreadline -liconv -ltermcap -lz" ./configure --prefix="${DDIR}" \ + --enable-reversed-symlink --host="${CHOST/-*/}-linux-musl" --build="${CHOST/-*/}-linux-musl" emake emake install # is not installed automatically @@ -183,7 +188,9 @@ src_install() { # install libc and dependencies dolib.so "${DDIR}"/lib/libc.so dolib.so "${DDIR}"/${CHOST/-*/}-linux-musl/${CHOST/-*/}-linux-musl/$(get_libdir)/*.so* - ln -sf libc.so"${IDIR}"/lib/ld-musl-${CHOST/-*/}.so.1 + ln -sf libc.so "${IDIR}"/$(get_libdir)/ld-musl-${CHOST/-*/}.so.1 + echo "/$(get_libdir)" > "${IDIR}"/etc/ld-musl-${CHOST/-*/}.path + ln -sf $(get_libdir) "${IDIR}"/lib # install zlib dolib.so "${DDIR}"/lib/libz.so* @@ -197,7 +204,7 @@ src_install() { dolib.so "${DDIR}"/lib/libcharset.so* dolib.so "${DDIR}"/lib/libhistory.so* dolib.so "${DDIR}"/lib/libreadline.so* - insinto "${IDIR}"/lib + insinto "${IDIR}"/$(get_libdir) doins "${DDIR}"/lib/charset.alias # install iconv @@ -209,7 +216,8 @@ src_install() { exeinto "${IDIR}"/libexec # dropbear expects sftp to be specialy named newexe "${DDIR}"/libexec/gesftpserver sftp-server - ln -sf ./ "${DDIR}"/usr + # and executed from /usr/libexec + ln -sf ./ "${IDIR}"/usr # insatll dropbear dobin "${DDIR}"/bin/{dbclient,dropbearconvert,dropbearkey,scp}