pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/bootstrap



Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Feb  2 15:53:44 UTC 2018

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
Use pkgsrc awk on ChromeOS.

Since Chrome 64, /usr/bin/awk has been a version of mawk that is permanently
in restricted mode. Notably, this means it cannot run pipes, which pkgsrc
requires. Use nawk.


To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.245 pkgsrc/bootstrap/bootstrap:1.246
--- pkgsrc/bootstrap/bootstrap:1.245    Sat Dec  9 00:33:36 2017
+++ pkgsrc/bootstrap/bootstrap  Fri Feb  2 15:53:44 2018
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.245 2017/12/09 00:33:36 sevan Exp $
+# $NetBSD: bootstrap,v 1.246 2018/02/02 15:53:44 bsiegert Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -707,10 +707,13 @@ Linux)
                root_group=root
        fi
        need_bsd_install=no
+       CHROMEOS_RELEASE_NAME!= awk -F = '$$1 == "CHROMEOS_RELEASE_NAME" { print $$2 }' /etc/lsb-release
        # Debian/Ubuntu's awk is mawk, and mawk does not understand
        # some regexp used in pkgsrc/mk.
        if [ -f /etc/debian_version ]; then
                need_awk=yes
+       elif grep -sq '^CHROMEOS_RELEASE_NAME' /etc/lsb-release; then
+               need_awk=yes
        else
                need_awk=no
        fi



Home | Main Index | Thread Index | Old Index