Merge "buildroot: Add Ghn init scripts"
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
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))
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)
diff --git a/package/golang/go_cloud/go_cloud.mk b/package/golang/go_cloud/go_cloud.mk
index 28c28b0..6a9689d 100644
--- a/package/golang/go_cloud/go_cloud.mk
+++ b/package/golang/go_cloud/go_cloud.mk
@@ -10,7 +10,7 @@
define GO_CLOUD_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/google.golang.org/"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/google.golang.org/cloud"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/google.golang.org/cloud"
endef
GO_CLOUD_POST_PATCH_HOOKS += GO_CLOUD_FIX_PATH
diff --git a/package/golang/go_cron/go_cron.mk b/package/golang/go_cron/go_cron.mk
index 4e9e518..71a55e5 100644
--- a/package/golang/go_cron/go_cron.mk
+++ b/package/golang/go_cron/go_cron.mk
@@ -10,7 +10,7 @@
define GO_CRON_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/github.com/robfig/"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/robfig/cron"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/robfig/cron"
endef
GO_CRON_POST_PATCH_HOOKS += GO_CRON_FIX_PATH
diff --git a/package/golang/go_fsnotify/go_fsnotify.mk b/package/golang/go_fsnotify/go_fsnotify.mk
index 357a915..e6ed876 100644
--- a/package/golang/go_fsnotify/go_fsnotify.mk
+++ b/package/golang/go_fsnotify/go_fsnotify.mk
@@ -10,7 +10,7 @@
define GO_FSNOTIFY_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/github.com/go-fsnotify/"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/go-fsnotify/fsnotify"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/go-fsnotify/fsnotify"
endef
GO_FSNOTIFY_POST_PATCH_HOOKS += GO_FSNOTIFY_FIX_PATH
diff --git a/package/golang/go_glog/go_glog.mk b/package/golang/go_glog/go_glog.mk
index d01dbd6..5779579 100644
--- a/package/golang/go_glog/go_glog.mk
+++ b/package/golang/go_glog/go_glog.mk
@@ -10,7 +10,7 @@
define GO_GLOG_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/github.com/golang"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/golang/glog"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/golang/glog"
endef
GO_GLOG_POST_PATCH_HOOKS += GO_GLOG_FIX_PATH
diff --git a/package/golang/go_goczmq/go_goczmq.mk b/package/golang/go_goczmq/go_goczmq.mk
index fdb7950..076ba30 100644
--- a/package/golang/go_goczmq/go_goczmq.mk
+++ b/package/golang/go_goczmq/go_goczmq.mk
@@ -10,7 +10,7 @@
define GO_GOCZMQ_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/github.com/zeromq"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/zeromq/goczmq"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/zeromq/goczmq"
endef
GO_GOCZMQ_POST_PATCH_HOOKS += GO_GOCZMQ_FIX_PATH
diff --git a/package/golang/go_godbus_dbus/go_godbus_dbus.mk b/package/golang/go_godbus_dbus/go_godbus_dbus.mk
index fc16412..15c040e 100644
--- a/package/golang/go_godbus_dbus/go_godbus_dbus.mk
+++ b/package/golang/go_godbus_dbus/go_godbus_dbus.mk
@@ -10,7 +10,7 @@
define GO_GODBUS_DBUS_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/github.com/godbus/"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/godbus/dbus"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/godbus/dbus"
endef
GO_GODBUS_DBUS_POST_PATCH_HOOKS += GO_GODBUS_DBUS_FIX_PATH
diff --git a/package/golang/go_golua/go_golua.mk b/package/golang/go_golua/go_golua.mk
index 27e65c6..f8e9d5b 100644
--- a/package/golang/go_golua/go_golua.mk
+++ b/package/golang/go_golua/go_golua.mk
@@ -10,7 +10,7 @@
define GO_GOLUA_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/github.com/aarzilli"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/aarzilli/golua"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/aarzilli/golua"
endef
GO_GOLUA_POST_PATCH_HOOKS += GO_GOLUA_FIX_PATH
diff --git a/package/golang/go_gonzojive_mdns/go_gonzojive_mdns.mk b/package/golang/go_gonzojive_mdns/go_gonzojive_mdns.mk
index 340a339..5f842e0 100644
--- a/package/golang/go_gonzojive_mdns/go_gonzojive_mdns.mk
+++ b/package/golang/go_gonzojive_mdns/go_gonzojive_mdns.mk
@@ -10,7 +10,7 @@
define GO_GONZOJIVE_MDNS_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/github.com/gonzojive"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/gonzojive/mdns"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/gonzojive/mdns"
endef
GO_GONZOJIVE_MDNS_POST_PATCH_HOOKS += GO_GONZOJIVE_MDNS_FIX_PATH
diff --git a/package/golang/go_google_api/go_google_api.mk b/package/golang/go_google_api/go_google_api.mk
index 4b96596..f063fb4 100644
--- a/package/golang/go_google_api/go_google_api.mk
+++ b/package/golang/go_google_api/go_google_api.mk
@@ -10,7 +10,7 @@
define GO_GOOGLE_API_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/google.golang.org"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/google.golang.org/api"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/google.golang.org/api"
endef
GO_GOOGLE_API_POST_PATCH_HOOKS += GO_GOOGLE_API_FIX_PATH
diff --git a/package/golang/go_grpc/go_grpc.mk b/package/golang/go_grpc/go_grpc.mk
index 21e68cc..97ca85d 100644
--- a/package/golang/go_grpc/go_grpc.mk
+++ b/package/golang/go_grpc/go_grpc.mk
@@ -10,7 +10,7 @@
define GO_GRPC_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/google.golang.org/"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/google.golang.org/grpc"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/google.golang.org/grpc"
endef
GO_GRPC_POST_PATCH_HOOKS += GO_GRPC_FIX_PATH
diff --git a/package/golang/go_luar/go_luar.mk b/package/golang/go_luar/go_luar.mk
index 86432d4..0a7386d 100644
--- a/package/golang/go_luar/go_luar.mk
+++ b/package/golang/go_luar/go_luar.mk
@@ -10,7 +10,7 @@
define GO_LUAR_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/github.com/stevedonovan/"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/stevedonovan/luar"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/stevedonovan/luar"
endef
GO_LUAR_POST_PATCH_HOOKS += GO_LUAR_FIX_PATH
diff --git a/package/golang/go_miekg_dns/go_miekg_dns.mk b/package/golang/go_miekg_dns/go_miekg_dns.mk
index 1917ca2..86133b6 100644
--- a/package/golang/go_miekg_dns/go_miekg_dns.mk
+++ b/package/golang/go_miekg_dns/go_miekg_dns.mk
@@ -10,7 +10,7 @@
define GO_MIEKG_DNS_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/github.com/miekg"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/miekg/dns"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/miekg/dns"
endef
GO_MIEKG_DNS_POST_PATCH_HOOKS += GO_MIEKG_DNS_FIX_PATH
diff --git a/package/golang/go_net/go_net.mk b/package/golang/go_net/go_net.mk
index 4dff340..0e3ef15 100644
--- a/package/golang/go_net/go_net.mk
+++ b/package/golang/go_net/go_net.mk
@@ -10,7 +10,7 @@
define GO_NET_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/golang.org/x"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/golang.org/x/net"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/golang.org/x/net"
endef
GO_NET_POST_PATCH_HOOKS += GO_NET_FIX_PATH
diff --git a/package/golang/go_oauth2/go_oauth2.mk b/package/golang/go_oauth2/go_oauth2.mk
index f2fe500..756208e 100644
--- a/package/golang/go_oauth2/go_oauth2.mk
+++ b/package/golang/go_oauth2/go_oauth2.mk
@@ -10,7 +10,7 @@
define GO_OAUTH2_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/golang.org/x"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/golang.org/x/oauth2"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/golang.org/x/oauth2"
endef
GO_OAUTH2_POST_PATCH_HOOKS += GO_OAUTH2_FIX_PATH
diff --git a/package/golang/go_protobuf/go_protobuf.mk b/package/golang/go_protobuf/go_protobuf.mk
index a714e4d..3989108 100644
--- a/package/golang/go_protobuf/go_protobuf.mk
+++ b/package/golang/go_protobuf/go_protobuf.mk
@@ -10,7 +10,7 @@
define GO_PROTOBUF_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/github.com/golang"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/golang/protobuf"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/github.com/golang/protobuf"
endef
GO_PROTOBUF_POST_PATCH_HOOKS += GO_PROTOBUF_FIX_PATH
@@ -20,7 +20,7 @@
# Install Go protobuf compiler on host
define HOST_GO_PROTOBUF_INSTALL_CMDS
mkdir -p "$(@D)/go/src/github.com/golang"
- ln -sT "$(@D)" "$(@D)/go/src/github.com/golang/protobuf"
+ ln -sfT "$(@D)" "$(@D)/go/src/github.com/golang/protobuf"
export $(GOLANG_ENV) ; \
GOARCH= GOBIN="$(HOST_DIR)/usr/bin" GOPATH="$(@D)/go" \
go install github.com/golang/protobuf/protoc-gen-go
diff --git a/package/golang/go_sys/go_sys.mk b/package/golang/go_sys/go_sys.mk
index 72cdcb5..dff37ba 100644
--- a/package/golang/go_sys/go_sys.mk
+++ b/package/golang/go_sys/go_sys.mk
@@ -10,7 +10,7 @@
define GO_SYS_FIX_PATH
mkdir -p "$(BUILD_DIR)/go_pkgs/src/golang.org/x"
- ln -sT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/golang.org/x/sys"
+ ln -sfT "$(@D)" "$(BUILD_DIR)/go_pkgs/src/golang.org/x/sys"
endef
GO_SYS_POST_PATCH_HOOKS += GO_SYS_FIX_PATH
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
