Attachment 182748 Details for Bug 219405 – proposed patch to fix NANO_PACKAGE_LIST

[patch] proposed patch to fix NANO_PACKAGE_LIST

file_219405.txt (text/plain), 1.17 KB, created by Wout Decré on 2017-05-19 21:16:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wout Decré

Created: 2017-05-19 21:16:56 UTC

Size: 1.17 KB

patch

obsolete

>Index: defaults.sh
>===================================================================
>--- defaults.sh	(revision 318412)
>+++ defaults.sh	(working copy)
>@@ -951,7 +951,6 @@
> 		echo "FAILED: need a pkg/ package for bootstrapping"
> 		exit 2
> 	fi
>-	NANO_PACKAGE_LIST="${_NANO_PKG_PACKAGE} ${NANO_PACKAGE_LIST}"
> 
> 	# Mount packages into chroot
> 	mkdir -p ${NANO_WORLDDIR}/_.p
>@@ -959,15 +958,25 @@
> 
> 	trap "umount ${NANO_WORLDDIR}/_.p ; rm -rf ${NANO_WORLDDIR}/_.p" 1 2 15 EXIT
> 
>-	# Install packages
>-	todo="$(echo "${NANO_PACKAGE_LIST}" | awk '{ print NF }')"
>-	echo "=== TODO: $todo"
>-	echo "${NANO_PACKAGE_LIST}"
>-	echo "==="
>-	for _PKG in ${NANO_PACKAGE_LIST}; do
>-		CR "${PKGCMD} add /_.p/${_PKG}"
>-	done
>+	# Install pkg-* package
>+	CR "${PKGCMD} add /_.p/${_NANO_PKG_PACKAGE}"
> 
>+	(
>+		cd "${NANO_PACKAGE_DIR}"
>+		_PKGS=`find ${NANO_PACKAGE_LIST} -not -name "${_NANO_PKG_PACKAGE}" -print | sort | uniq`
>+
>+		# Show todo
>+		todo=`echo "$_PKGS" | wc -l`
>+		echo "=== TODO: $todo"
>+		echo "$_PKGS"
>+		echo "==="
>+
>+		# Install packages
>+		for _PKG in $_PKGS; do
>+			CR "${PKGCMD} add /_.p/${_PKG}"
>+		done
>+	)
>+
> 	CR0 "${PKGCMD} info"
> 
> 	trap - 1 2 15 EXIT

Actions: View | Diff

Attachments on bug 219405: 182741 | 182748