Merge branch 'master' of github.com:brianredbeard/coreos_buildroot

Author: brianredbeard

README.md

@@ -32,5 +32,62 @@ $ cd buildroot
 $ make BR2_EXTERNAL=../coreos_buildroot menuconfig
 ```
 This connects the two repos together and exposes all of the coreos_buildroot
-options through the menu option "User-provided options  --->"
+options through the menu option `"User-provided options  --->"`
 
+## Using CoreOS Buildroot
+
+### Creating a new `defconfig`
+
+defconfigs are default sets of options which are used to populate a `.config`
+file inside of buildroot.  Using a defconfig file one is able to persist a list
+of configuration options beyond the life cycle of a single checkout of
+buildroot.  This is to say that the defconfig removes things not essential to
+the generation of the user defined filesystem so that as various default options
+change over time, the user is able to cleanly integrate them.
+
+To create a new defconfig file the user will configure the container and then
+perform a save operation which will strip out the extraneous configuration
+options.  The starting process for this can begin in two ways: Start from an 
+empty config (e.g. `make menuconfig` from within a clean repository checkout) or
+start from another defconfig, mutate it, and save the changes.  In the first
+case it is just as simple as removing an existing `.config` file from the
+upstream buildroot checkout and running `make menuconfig`.
+
+If one wishes to start from an existing defconfig, they will identify the
+configuration they wish to start from in either
+[buildroot/configs](https://github.com/buildroot/buildroot/tree/master/configs)
+or from
+[coreos_buildroot/configs](https://github.com/brianredbeard/coreos_buildroot/tree/master/configs).
+
+Once a starting defconfig has been chosen, one uses the name of that defconfig
+as as argument to `make`, e.g. `make corebox_defconfig` and then makes relevant
+changes using `make menuconfig`.
+
+After any desired changes have been made through `make menuconfig`, the command
+`make savedefconfig` is used.  If one wishes to provide a filename for the saved
+artifact, it can be supplied with the variable `BR2_DEFCONFIG`, e.g. `make
+savedefconfig BR2_DEFCONFIG=../coreos_buildroot/configs/example_defconfig`.  Any
+defconfigs should always end with the string `_defconfig`.
+
+### Things to remember when defining options for a generated artifact
+
+In the process of building a container filesystem there are a number of things
+that you will not need as compared to a full Linux distro.  Some examples are an
+init system (e.g. sysVinit or systemd) or a kernel.  At the same time many users
+will realize that they do not need
+[locales](http://www.gnu.org/software/libc/manual/html_node/Locales.html) beyond
+"`C`" or "`POSIX`".
+
+What some users may not understand is that even when *not* building a kernel,
+the _kernel headers_ will still be needed to establish an [application binary
+interface](https://en.wikipedia.org/wiki/Linux_kernel_interfaces#Linux_ABI)
+contract for program execution.  As a part of this contract one must always use
+a _lower_ version of the kernel headers than the kernel on the desired system.
+This means that 3.4.3 kernel headers can be used with a 3.10.0 or a 4.4.5
+kernel, but not a 2.6.32 kernel.  This becomes important because a user needs to
+decide what is an appropriate level of kernel headers to use for a desired
+platform.  This means that should a user choose to use the "latest and greatest"
+version of the kernel headers it _may_ work on a CoreOS alpha instance but would
+not run on a CoreOS stable nor a Red Hat Enterprise Linux host.  In general,
+sticking to using 3.4.x kernel headers is a safe bet which provides a broad
+level of compatibility across kernel versions.

package/openresty/openresty.hash

@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 aa5dcae035dda6e483bc1bd3d969d7113205dc2d0a3702ece0ad496c88a653c5  openresty-1.9.7.4.tar.gz
+sha256 75cf020144048c9013ee487cb48107a5b99de04a5a8fa83839c8b4c3aa4eb0db  openresty-1.9.15.1.tar.gz

package/openresty/openresty.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENRESTY_VERSION = 1.9.7.4
+OPENRESTY_VERSION = 1.9.15.1
 OPENRESTY_SITE = https://openresty.org/download
 OPENRESTY_DEPENDENCIES += pcre openssl
 OPENRESTY_LICENSE = BSD-2c
@@ -43,8 +43,8 @@ OPENRESTY_CONF_OPTS += \
         --pid-path=/var/run/nginx.pid \
         --lock-path=/var/run/lock/nginx.lock \
         --error-log-path=/var/log/nginx/error.log \
-        --user=nobody \                                                        
-        --group=nogroup \ 
+        --user=nobody \
+        --group=nogroup \
         --http-log-path=/var/log/nginx/access.log \
         --http-client-body-temp-path=/var/tmp/nginx/client-body \
         --http-proxy-temp-path=/var/tmp/nginx/proxy \