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 C5879138A1F for ; Sun, 20 Apr 2014 13:41:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8DF3E09AA; Sun, 20 Apr 2014 13:41:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F985E09AA for ; Sun, 20 Apr 2014 13:41:23 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D38B33FD4D for ; Sun, 20 Apr 2014 13:41:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 8644618181 for ; Sun, 20 Apr 2014 13:41:19 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1398000146.ea06266ec713b0bcaf635259e44f802c4e6c7d65.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/netboot2-final.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: ea06266ec713b0bcaf635259e44f802c4e6c7d65 X-VCS-Branch: 3.0 Date: Sun, 20 Apr 2014 13:41:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0b0e7510-b90f-47dc-ae9b-934001710b16 X-Archives-Hash: e5e6b257d6eb595ee4eb67ef152c88eb commit: ea06266ec713b0bcaf635259e44f802c4e6c7d65 Author: Guy Martin gentoo org> AuthorDate: Sun Apr 20 13:21:21 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Apr 20 13:22:26 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ea06266e netboot2.sh: Fix missing slashes in paths --- targets/support/netboot2-final.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh index 732a1f1..ebd5187 100755 --- a/targets/support/netboot2-final.sh +++ b/targets/support/netboot2-final.sh @@ -4,20 +4,20 @@ source ${clst_shdir}/support/functions.sh source ${clst_shdir}/support/filesystem-functions.sh -extract_kernels ${clst_target_path}boot +extract_kernels ${clst_target_path}/boot -# Move kernel binaries to ${clst_target_path}kernels, and -# move everything else to ${clst_target_path}kernels/misc -mkdir ${clst_target_path}kernels -mkdir ${clst_target_path}kernels/misc +# Move kernel binaries to ${clst_target_path}/kernels, and +# move everything else to ${clst_target_path}/kernels/misc +mkdir ${clst_target_path}/kernels +mkdir ${clst_target_path}/kernels/misc for x in ${clst_boot_kernel}; do - mv ${clst_target_path}boot/${x} ${clst_target_path}kernels - mv ${clst_target_path}boot/${x}.igz ${clst_target_path}kernels/misc - mv ${clst_target_path}boot/System-${x}.map ${clst_target_path}kernels/misc + mv ${clst_target_path}/boot/${x} ${clst_target_path}/kernels + mv ${clst_target_path}/boot/${x}.igz ${clst_target_path}/kernels/misc + mv ${clst_target_path}/boot/System-${x}.map ${clst_target_path}/kernels/misc done -rmdir ${clst_target_path}boot +rmdir ${clst_target_path}/boot # Any post-processing necessary for each architecture can be done here. This # may include things like sparc's elftoaout, x86's PXE boot, etc. @@ -50,8 +50,8 @@ case ${clst_hostarch} in piggyback=piggyback64 fi for x in ${clst_boot_kernel}; do - elftoaout ${clst_target_path}/kernels/${x} -o ${clst_target_path}${x}-a.out - ${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}kernels/misc/System.map-${x} ${clst_target_path}kernels/misc/${x}.igz + elftoaout ${clst_target_path}/kernels/${x} -o ${clst_target_path}/${x}-a.out + ${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System.map-${x} ${clst_target_path}/kernels/misc/${x}.igz done ;; ia64)