commit 2a1465262989b07541ceda64d173daa87ef01fa7
author Bryan Henry <bryanhenry@google.com> Tue Jan 24 02:21:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 24 02:21:06 2017 +0000
tree 9b2d113fafff2a6a02d7d27b8e2d7273e6dc74f4
parent c235ee39dccf5120c5d99b04fcc6633bec01e650
parent 7df9853ab4791908609eac77a8a643c493c28f09

Merge "Fix go_pkgs symlink creation in golang packages"

fs/skeleton/fiber/config

diff --git a/fs/skeleton/fiber/config b/fs/skeleton/fiber/config
new file mode 120000
index 0000000..4088526
--- /dev/null
+++ b/fs/skeleton/fiber/config
@@ -0,0 +1 @@
+../config/
\ No newline at end of file

linux/linux.mk

diff --git a/linux/linux.mk b/linux/linux.mk
index 88b83f2..fbb7b5f 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -48,7 +48,7 @@
 
 # Get the real Linux version, which tells us where kernel modules are
 # going to be installed in the target filesystem.
-LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
+LINUX_VERSION_PROBED = $(shell LOGLINEAR_LEAVE_STDOUT=1 $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null)
 
 ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y)
 KERNEL_DTS_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))

loglinear

diff --git a/loglinear b/loglinear
index 873d9b1..6afc211 100755
--- a/loglinear
+++ b/loglinear
@@ -249,8 +249,12 @@
       _Write(conn.fileno(), '%s %s\nPWD: %s\nStarting: %s (%s)\n'
              % (parent, nice_cmdline or '',
                 os.getcwd(), cmdline, nice_cmdline))
-      os.dup2(conn.fileno(), 1)
-      os.dup2(conn.fileno(), 2)
+      if os.environ.get('LOGLINEAR_LEAVE_STDOUT'):
+        _Write(conn.fileno(), 'Not redirecting stdout or stderr ' \
+            'because LOGLINEAR_LEAVE_STDOUT is set')
+      else:
+        os.dup2(conn.fileno(), 1)
+        os.dup2(conn.fileno(), 2)
       conn.close()
       os.environ['LOGLINEAR_PARENT'] = str(myid)
       os.execvp(cmdline[0], cmdline)

package/google/google_platform/rc/syslog/run

diff --git a/package/google/google_platform/rc/syslog/run b/package/google/google_platform/rc/syslog/run
index 4acc747..ee90f69 100755
--- a/package/google/google_platform/rc/syslog/run
+++ b/package/google/google_platform/rc/syslog/run
@@ -2,4 +2,4 @@
 fdmove -c 2 1
 if { runnable syslogd }
 # run with CAP_NET_BIND_SERVICE
-minijail0 -u syslog -g syslog -c 0x400 /bin/syslogd -l 0.0.0.0:514
+minijail0 -u syslog -g syslog -c 0x400 /bin/syslogd -p 514