proto: Drop LinuxRuntimeSpec (and work around 'linux' sensitivity)

wking · wking · commit 83aff07956b8 · 2015-09-27T00:31:34.000-07:00
This mirror's the previous commit's change for config.proto, so see
that commit message for an explaination.

The "linuxx" hack works around the "expected unqualified-id before
numeric constant" breakage, so we can restore cpp/runtime_config.pb.h
in the Makefile rule.

Signed-off-by: W. Trevor King &lt;wking@tremily.us&gt;
diff --git a/proto/Makefile b/proto/Makefile
@@ -45,7 +45,7 @@ $(CPP_DIR)/%.pb.cc: %.proto
 
 %_cpp: %.cc $(CPP_FILES)
 	pkg-config --cflags protobuf  # fails if protobuf is not installed
-	c++ $< $(filter $(CPP_DIR)/config%.cc, $(CPP_FILES)) -o $@ $$(pkg-config --cflags --libs protobuf) -I $(CPP_DIR)
+	c++ $< $(filter %.cc, $(CPP_FILES)) -o $@ $$(pkg-config --cflags --libs protobuf) -I $(CPP_DIR)
 
 py: $(PY_FILES)
 
diff --git a/proto/runtime_config.proto b/proto/runtime_config.proto
@@ -10,6 +10,8 @@ message RuntimeSpec {
 	repeated MountFieldEntry mounts = 1;
 	// Hooks are the commands run at various lifecycle events of the container.
 	Hooks hooks = 2;
+	// LinuxRuntime is the Linux-specific, host-specific configuration.
+	LinuxRuntime linuxx = 3;
 }
 
 // MountFieldEntry is more backwards compatible protobuf associative map (than map<string, Mount>)
@@ -49,13 +51,6 @@ message Hooks {
 BEGIN Linux specific runtime
 */
 
-// LinuxRuntimeSpec is the full specification for linux containers.
-message LinuxRuntimeSpec {
-	RuntimeSpec runtime_spec = 1;
-	// LinuxRuntime is platform specific configuration for linux based containers.
-	LinuxRuntime linux = 2;
-}
-
 // LinuxRuntime hosts the Linux-only runtime information
 message LinuxRuntime {
 	// UidMapping specifies user mappings for supporting user namespaces on linux.
