From 6ed1163c98703f8dd0693cecbadc84d2cda811c3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 18 Dec 2017 17:41:53 +0100 Subject: [PATCH] Remove redundant build-tags Files that are suffixed with `_linux.go` or `_windows.go` are already only built on Linux / Windows, so these build-tags were redundant. Signed-off-by: Sebastiaan van Stijn --- cmd/dockerd/daemon_linux.go | 2 -- container/container_windows.go | 2 -- daemon/archive_tarcopyoptions_windows.go | 2 -- daemon/configs_linux.go | 2 -- daemon/configs_windows.go | 2 -- daemon/container_windows.go | 2 -- daemon/graphdriver/driver_linux.go | 2 -- daemon/graphdriver/vfs/copy_linux.go | 2 -- daemon/graphdriver/vfs/quota_linux.go | 2 -- daemon/initlayer/setup_windows.go | 2 -- daemon/logger/gcplogs/gcplogging_linux.go | 2 -- daemon/secrets_linux.go | 2 -- daemon/secrets_windows.go | 2 -- daemon/selinux_linux.go | 2 -- daemon/stats/collector_windows.go | 2 -- daemon/volumes_windows.go | 2 -- distribution/pull_v2_windows.go | 2 -- opts/hosts_windows.go | 2 -- pkg/archive/archive_windows.go | 2 -- pkg/directory/directory_windows.go | 2 -- pkg/dmesg/dmesg_linux.go | 2 -- pkg/fsutils/fsutils_linux.go | 2 -- pkg/homedir/homedir_linux.go | 2 -- pkg/idtools/idtools_windows.go | 2 -- pkg/ioutils/temp_windows.go | 2 -- pkg/mount/mountinfo_linux.go | 2 -- pkg/mount/sharedsubtree_linux.go | 2 -- pkg/parsers/kernel/kernel_windows.go | 2 -- pkg/reexec/command_linux.go | 2 -- pkg/reexec/command_windows.go | 2 -- pkg/signal/signal_windows.go | 2 -- pkg/sysinfo/numcpu_linux.go | 2 -- pkg/sysinfo/numcpu_windows.go | 2 -- pkg/sysinfo/sysinfo_windows.go | 2 -- pkg/system/chtimes_windows.go | 2 -- pkg/system/filesys_windows.go | 2 -- pkg/system/mknod_windows.go | 2 -- pkg/system/umask_windows.go | 2 -- pkg/term/term_windows.go | 2 -- plugin/backend_linux.go | 2 -- plugin/v2/plugin_linux.go | 2 -- 41 files changed, 82 deletions(-) diff --git a/cmd/dockerd/daemon_linux.go b/cmd/dockerd/daemon_linux.go index b58f0f08a3..b09fed9293 100644 --- a/cmd/dockerd/daemon_linux.go +++ b/cmd/dockerd/daemon_linux.go @@ -1,5 +1,3 @@ -// +build linux - package main import systemdDaemon "github.com/coreos/go-systemd/daemon" diff --git a/container/container_windows.go b/container/container_windows.go index 5cb2e456c9..92b50a6eb6 100644 --- a/container/container_windows.go +++ b/container/container_windows.go @@ -1,5 +1,3 @@ -// +build windows - package container import ( diff --git a/daemon/archive_tarcopyoptions_windows.go b/daemon/archive_tarcopyoptions_windows.go index 535efd222e..500e1285df 100644 --- a/daemon/archive_tarcopyoptions_windows.go +++ b/daemon/archive_tarcopyoptions_windows.go @@ -1,5 +1,3 @@ -// +build windows - package daemon import ( diff --git a/daemon/configs_linux.go b/daemon/configs_linux.go index af20ad78bd..d498c951e3 100644 --- a/daemon/configs_linux.go +++ b/daemon/configs_linux.go @@ -1,5 +1,3 @@ -// +build linux - package daemon func configsSupported() bool { diff --git a/daemon/configs_windows.go b/daemon/configs_windows.go index 7cb2e9c438..d498c951e3 100644 --- a/daemon/configs_windows.go +++ b/daemon/configs_windows.go @@ -1,5 +1,3 @@ -// +build windows - package daemon func configsSupported() bool { diff --git a/daemon/container_windows.go b/daemon/container_windows.go index 6fdd1e678e..6db130ab05 100644 --- a/daemon/container_windows.go +++ b/daemon/container_windows.go @@ -1,5 +1,3 @@ -//+build windows - package daemon import ( diff --git a/daemon/graphdriver/driver_linux.go b/daemon/graphdriver/driver_linux.go index f59862db85..d2d7c9f64c 100644 --- a/daemon/graphdriver/driver_linux.go +++ b/daemon/graphdriver/driver_linux.go @@ -1,5 +1,3 @@ -// +build linux - package graphdriver import ( diff --git a/daemon/graphdriver/vfs/copy_linux.go b/daemon/graphdriver/vfs/copy_linux.go index a632d353e3..1a63a11807 100644 --- a/daemon/graphdriver/vfs/copy_linux.go +++ b/daemon/graphdriver/vfs/copy_linux.go @@ -1,5 +1,3 @@ -// +build linux - package vfs import "github.com/docker/docker/daemon/graphdriver/copy" diff --git a/daemon/graphdriver/vfs/quota_linux.go b/daemon/graphdriver/vfs/quota_linux.go index 032c15b9ef..d40d0d13e9 100644 --- a/daemon/graphdriver/vfs/quota_linux.go +++ b/daemon/graphdriver/vfs/quota_linux.go @@ -1,5 +1,3 @@ -// +build linux - package vfs import "github.com/docker/docker/daemon/graphdriver/quota" diff --git a/daemon/initlayer/setup_windows.go b/daemon/initlayer/setup_windows.go index b47563ebf6..ff78a4d0b0 100644 --- a/daemon/initlayer/setup_windows.go +++ b/daemon/initlayer/setup_windows.go @@ -1,5 +1,3 @@ -// +build windows - package initlayer import ( diff --git a/daemon/logger/gcplogs/gcplogging_linux.go b/daemon/logger/gcplogs/gcplogging_linux.go index 8917bdd4c7..41a09362f2 100644 --- a/daemon/logger/gcplogs/gcplogging_linux.go +++ b/daemon/logger/gcplogs/gcplogging_linux.go @@ -1,5 +1,3 @@ -// +build linux - package gcplogs import ( diff --git a/daemon/secrets_linux.go b/daemon/secrets_linux.go index fca4e12598..6ae0117b73 100644 --- a/daemon/secrets_linux.go +++ b/daemon/secrets_linux.go @@ -1,5 +1,3 @@ -// +build linux - package daemon func secretsSupported() bool { diff --git a/daemon/secrets_windows.go b/daemon/secrets_windows.go index 9054354c8d..6ae0117b73 100644 --- a/daemon/secrets_windows.go +++ b/daemon/secrets_windows.go @@ -1,5 +1,3 @@ -// +build windows - package daemon func secretsSupported() bool { diff --git a/daemon/selinux_linux.go b/daemon/selinux_linux.go index fb2578bf4d..46da7f1370 100644 --- a/daemon/selinux_linux.go +++ b/daemon/selinux_linux.go @@ -1,5 +1,3 @@ -// +build linux - package daemon import "github.com/opencontainers/selinux/go-selinux" diff --git a/daemon/stats/collector_windows.go b/daemon/stats/collector_windows.go index 5fb27ced66..03109fd8fc 100644 --- a/daemon/stats/collector_windows.go +++ b/daemon/stats/collector_windows.go @@ -1,5 +1,3 @@ -// +build windows - package stats // platformNewStatsCollector performs platform specific initialisation of the diff --git a/daemon/volumes_windows.go b/daemon/volumes_windows.go index 62c9e23ac0..bfb5133d3d 100644 --- a/daemon/volumes_windows.go +++ b/daemon/volumes_windows.go @@ -1,5 +1,3 @@ -// +build windows - package daemon import ( diff --git a/distribution/pull_v2_windows.go b/distribution/pull_v2_windows.go index b4573e1eca..08ff4371cb 100644 --- a/distribution/pull_v2_windows.go +++ b/distribution/pull_v2_windows.go @@ -1,5 +1,3 @@ -// +build windows - package distribution import ( diff --git a/opts/hosts_windows.go b/opts/hosts_windows.go index 7c239e00f1..684f0e128c 100644 --- a/opts/hosts_windows.go +++ b/opts/hosts_windows.go @@ -1,5 +1,3 @@ -// +build windows - package opts // DefaultHost constant defines the default host string used by docker on Windows diff --git a/pkg/archive/archive_windows.go b/pkg/archive/archive_windows.go index a22410c039..66243a64ab 100644 --- a/pkg/archive/archive_windows.go +++ b/pkg/archive/archive_windows.go @@ -1,5 +1,3 @@ -// +build windows - package archive import ( diff --git a/pkg/directory/directory_windows.go b/pkg/directory/directory_windows.go index 6fb0917c4c..efe05cecef 100644 --- a/pkg/directory/directory_windows.go +++ b/pkg/directory/directory_windows.go @@ -1,5 +1,3 @@ -// +build windows - package directory import ( diff --git a/pkg/dmesg/dmesg_linux.go b/pkg/dmesg/dmesg_linux.go index 7df7f3d436..2fb494e1bf 100644 --- a/pkg/dmesg/dmesg_linux.go +++ b/pkg/dmesg/dmesg_linux.go @@ -1,5 +1,3 @@ -// +build linux - package dmesg import ( diff --git a/pkg/fsutils/fsutils_linux.go b/pkg/fsutils/fsutils_linux.go index e6094b55b7..7596259458 100644 --- a/pkg/fsutils/fsutils_linux.go +++ b/pkg/fsutils/fsutils_linux.go @@ -1,5 +1,3 @@ -// +build linux - package fsutils import ( diff --git a/pkg/homedir/homedir_linux.go b/pkg/homedir/homedir_linux.go index 012fe52a28..a7cd2e1039 100644 --- a/pkg/homedir/homedir_linux.go +++ b/pkg/homedir/homedir_linux.go @@ -1,5 +1,3 @@ -// +build linux - package homedir import ( diff --git a/pkg/idtools/idtools_windows.go b/pkg/idtools/idtools_windows.go index 94ca33afb1..ec49177702 100644 --- a/pkg/idtools/idtools_windows.go +++ b/pkg/idtools/idtools_windows.go @@ -1,5 +1,3 @@ -// +build windows - package idtools import ( diff --git a/pkg/ioutils/temp_windows.go b/pkg/ioutils/temp_windows.go index c258e5fdd8..fb14c95489 100644 --- a/pkg/ioutils/temp_windows.go +++ b/pkg/ioutils/temp_windows.go @@ -1,5 +1,3 @@ -// +build windows - package ioutils import ( diff --git a/pkg/mount/mountinfo_linux.go b/pkg/mount/mountinfo_linux.go index be69fee1d7..dde889e7bf 100644 --- a/pkg/mount/mountinfo_linux.go +++ b/pkg/mount/mountinfo_linux.go @@ -1,5 +1,3 @@ -// +build linux - package mount import ( diff --git a/pkg/mount/sharedsubtree_linux.go b/pkg/mount/sharedsubtree_linux.go index 8ceec84bc6..f3c13e5a16 100644 --- a/pkg/mount/sharedsubtree_linux.go +++ b/pkg/mount/sharedsubtree_linux.go @@ -1,5 +1,3 @@ -// +build linux - package mount // MakeShared ensures a mounted filesystem has the SHARED mount option enabled. diff --git a/pkg/parsers/kernel/kernel_windows.go b/pkg/parsers/kernel/kernel_windows.go index e598672776..93620eeffc 100644 --- a/pkg/parsers/kernel/kernel_windows.go +++ b/pkg/parsers/kernel/kernel_windows.go @@ -1,5 +1,3 @@ -// +build windows - package kernel import ( diff --git a/pkg/reexec/command_linux.go b/pkg/reexec/command_linux.go index 05319eacc9..d3f10615fc 100644 --- a/pkg/reexec/command_linux.go +++ b/pkg/reexec/command_linux.go @@ -1,5 +1,3 @@ -// +build linux - package reexec import ( diff --git a/pkg/reexec/command_windows.go b/pkg/reexec/command_windows.go index ca871c4227..c320876b79 100644 --- a/pkg/reexec/command_windows.go +++ b/pkg/reexec/command_windows.go @@ -1,5 +1,3 @@ -// +build windows - package reexec import ( diff --git a/pkg/signal/signal_windows.go b/pkg/signal/signal_windows.go index 440f2700e2..c84a63e821 100644 --- a/pkg/signal/signal_windows.go +++ b/pkg/signal/signal_windows.go @@ -1,5 +1,3 @@ -// +build windows - package signal import ( diff --git a/pkg/sysinfo/numcpu_linux.go b/pkg/sysinfo/numcpu_linux.go index f1d2d9db30..5739b33ac6 100644 --- a/pkg/sysinfo/numcpu_linux.go +++ b/pkg/sysinfo/numcpu_linux.go @@ -1,5 +1,3 @@ -// +build linux - package sysinfo import ( diff --git a/pkg/sysinfo/numcpu_windows.go b/pkg/sysinfo/numcpu_windows.go index 1d89dd5503..3516182ff2 100644 --- a/pkg/sysinfo/numcpu_windows.go +++ b/pkg/sysinfo/numcpu_windows.go @@ -1,5 +1,3 @@ -// +build windows - package sysinfo import ( diff --git a/pkg/sysinfo/sysinfo_windows.go b/pkg/sysinfo/sysinfo_windows.go index 4e6255bc59..8889318c39 100644 --- a/pkg/sysinfo/sysinfo_windows.go +++ b/pkg/sysinfo/sysinfo_windows.go @@ -1,5 +1,3 @@ -// +build windows - package sysinfo // New returns an empty SysInfo for windows for now. diff --git a/pkg/system/chtimes_windows.go b/pkg/system/chtimes_windows.go index 45428c141c..a1f4fd53bc 100644 --- a/pkg/system/chtimes_windows.go +++ b/pkg/system/chtimes_windows.go @@ -1,5 +1,3 @@ -// +build windows - package system import ( diff --git a/pkg/system/filesys_windows.go b/pkg/system/filesys_windows.go index a61b53d0ba..b1e46d9e85 100644 --- a/pkg/system/filesys_windows.go +++ b/pkg/system/filesys_windows.go @@ -1,5 +1,3 @@ -// +build windows - package system import ( diff --git a/pkg/system/mknod_windows.go b/pkg/system/mknod_windows.go index 2e863c0215..ba2692aedd 100644 --- a/pkg/system/mknod_windows.go +++ b/pkg/system/mknod_windows.go @@ -1,5 +1,3 @@ -// +build windows - package system // Mknod is not implemented on Windows. diff --git a/pkg/system/umask_windows.go b/pkg/system/umask_windows.go index 13f1de1769..71fc0f1bad 100644 --- a/pkg/system/umask_windows.go +++ b/pkg/system/umask_windows.go @@ -1,5 +1,3 @@ -// +build windows - package system // Umask is not supported on the windows platform. diff --git a/pkg/term/term_windows.go b/pkg/term/term_windows.go index b6819b3426..284ac63010 100644 --- a/pkg/term/term_windows.go +++ b/pkg/term/term_windows.go @@ -1,5 +1,3 @@ -// +build windows - package term import ( diff --git a/plugin/backend_linux.go b/plugin/backend_linux.go index 28a6c18ab5..1f2830a899 100644 --- a/plugin/backend_linux.go +++ b/plugin/backend_linux.go @@ -1,5 +1,3 @@ -// +build linux - package plugin import ( diff --git a/plugin/v2/plugin_linux.go b/plugin/v2/plugin_linux.go index be82363249..9590df4f7d 100644 --- a/plugin/v2/plugin_linux.go +++ b/plugin/v2/plugin_linux.go @@ -1,5 +1,3 @@ -// +build linux - package v2 import (