mesos-reviews mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] greggomann closed pull request #191: Adding support for s390x architecture
Date Mon, 27 Aug 2018 17:49:54 GMT
greggomann closed pull request #191: Adding support for s390x architecture
URL: https://github.com/apache/mesos/pull/191
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/src/linux/ldcache.cpp b/src/linux/ldcache.cpp
index 6260496672..9c2ec8263f 100644
--- a/src/linux/ldcache.cpp
+++ b/src/linux/ldcache.cpp
@@ -114,17 +114,15 @@ struct HeaderNew
                           // and align to 8 byte boundary.
 };
 
-
 struct EntryNew
 {
-  int16_t flags;        // Flags bits determine arch and library type.
+  int32_t flags;        // Flags bits determine arch and library type.
   uint32_t key;         // String table index.
   uint32_t value;       // String table index.
   uint32_t osVersion;   // Required OS version.
   uint64_t hwcap;       // Hwcap entry.
 };
 
-
 // Returns a 'boundary' aligned pointer by rounding up to
 // the nearest multiple of 'boundary'.
 static inline const char* align(const char* address, size_t boundary)
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 4637ca62b2..26646ea93c 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -148,6 +148,15 @@ mesos::internal::slave::Flags::Flags()
       "Directory the appc provisioner will store images in.\n",
       path::join(os::temp(), "mesos", "store", "appc"));
 
+  #if defined(__s390x__)
+  add(&Flags::docker_registry,
+      "docker_registry",
+      "The default url for pulling Docker images. It could either be a Docker\n"
+      "registry server url (i.e: `https://registry.docker.io`), or a local\n"
+      "path (i.e: `/tmp/docker/images`) in which Docker image archives\n"
+      "(result of `docker save`) are stored.",
+      "/opt/docker/images");
+  #else
   add(&Flags::docker_registry,
       "docker_registry",
       "The default url for pulling Docker images. It could either be a Docker\n"
@@ -155,6 +164,7 @@ mesos::internal::slave::Flags::Flags()
       "path (i.e: `/tmp/docker/images`) in which Docker image archives\n"
       "(result of `docker save`) are stored.",
       "https://registry-1.docker.io");
+  #endif
 
   add(&Flags::docker_store_dir,
       "docker_store_dir",


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message