Beyond-DIY patch fixed
Igor Gueths
diy-linux-dev@diy-linux.org
Thu, 20 Dec 2007 14:12:58 -0500
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi all. I do apologize for the breakage, in case anyone tried applying the last
patch I sent up. The problem was due to my using a very broken cut/paste
function in Speakup (http://linux-speakup.org), that stripped out all
whitespace, and the fact that I was not aware of this at the time. This one here
ought to work.
- --- gsbuild_orig/gsbuild.sh 2007-12-20 14:07:52.000000000 -0500
+++ gsbuild-20071113/gsbuild.sh 2007-12-20 14:08:08.000000000 -0500
@@ -160,7 +160,11 @@
# ---------------------------------------------------------------------------- #
EOF
cat scriptlets/packagedata >> $PKG_LIST
- - echo "done."
+if [[ "$BEYOND_DIY" == "y" ]]; then
+echo "Inserting Beyond-DIY packages into the package list."
+cat scriptlets/beyond-diy-packages >> $PKG_LIST
+fi
+echo "Done."
echo -en "Creating $ORDER_LIST from scriptlets/build-order.*... "
echo 'TEMPTOOLS_PKGS="' > $ORDER_LIST
@@ -168,6 +172,11 @@
echo -e '"\n' >> $ORDER_LIST
echo 'CHROOT_PKGS="' >> $ORDER_LIST
cat scriptlets/build-order.chroot >> $ORDER_LIST
+if [[ "$BEYOND_DIY" == "y" ]]; then
+echo "Inserting Beyond-DIY packages into the chroot phase build order."
+cat scriptlets/build-order.beyond-diy >> $ORDER_LIST
+echo "Done."
+fi
echo -e '$ARCH_SPECIFIC_PKGS\n$PM_PKGS\n"' >> $ORDER_LIST
for P in bash-pass1 $X86_PKGS $PPC_PKGS $KH_PKGS $PACMAN_PKGS $BPM_PKGS about_pmdest go_chroot; do
sed -i "/$P/d" $ORDER_LIST
- --
Igor
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
iQIVAwUBR2q+uqe2pgKIdGq4AQrSDg//ZzZPOm/0f3NfOllN7VrlPMbVUb7hBn7p
Y9wZrhb2FP6k03hU+fn1AEO7yptq3FsMfnw7+enOBIzcCLuxXiyWtlQWDhUpkftr
BdpDaBeRtLnniGX2Wck1vktMAIuVTupGp1iIVaX91fQws4syLJq2tj5FVfDAmOGC
d+43QAWu7XMJLvvbnl8LSaOhrdLTKatrq9ZYdBzN2oJLJHwf7iDS0JGUorz0TnHW
NsfJwSxdjzH5/8WaEoqaCt7qcKY7iRS7Pgn4XWQ21Wbd6RXz6bl2U+pp0BdW4+mL
fh32NOGNYcF7j2B5HcRjFXqPI9yMaWEiwAAae+XK0bYnmPPQe+6/6QT2TYXJDK7H
ulvWfpBYo9jDAw7uiVrCJT/35EazNbpa3nTRdbKNOiBg2B2MzMe01/ACpJ72qP5a
mdKTQPw4HHFCZI78u1dSITpGEPCj0ziUIzy2InZe6qg6fTHXjz0aiRuvY/+a06DG
W3csbREsgS0TieAELsF8MB2UYEOgJomKgwmk7hr5hrhY5F4onsmw0fFgHDOE6H1j
0l51SjPyTaTNsxXkKQDBJmbv02DfoYtS88lq+j/svbzbcF3276uxGb2r14N+AyRw
zpnhIIj+Z8pMGxC3i2c4UpNodQH/gTtKEtkozZXjcREKJVchBk+soB5yBnXVdo0R
+oEZ0wZcX4Q=
=U+DC
-----END PGP SIGNATURE-----