From 2f0fcff8efb6fef8ac3f36504aaeb7e2dec86c57 Mon Sep 17 00:00:00 2001 From: Pablo Carranza Velez Date: Tue, 6 Mar 2018 20:34:10 -0800 Subject: [PATCH] Start using an externally built resin/$ARCH-supervisor-base:v1.1.0 as base image, which adds the verbatim option to dns.lookup Depends-on: https://github.com/resin-io/resin-supervisor-base/pull/5 Change-Type: minor Signed-off-by: Pablo Carranza Velez --- .gitmodules | 11 - Dockerfile | 47 +--- Makefile | 6 +- automation/build.sh | 19 -- base-image/bitbake | 1 - base-image/build.sh | 54 ----- base-image/build/conf/bblayers.conf | 12 - base-image/build/conf/local.conf | 225 ------------------ .../build/conf/machine/generic-armv5.conf | 7 - .../build/conf/machine/generic-armv6.conf | 7 - .../build/conf/machine/generic-armv7hf.conf | 7 - .../build/conf/machine/generic-armv8.conf | 7 - .../build/conf/machine/generic-x86-64.conf | 6 - .../build/conf/machine/generic-x86.conf | 5 - base-image/build/conf/machine/i386-nlp.conf | 5 - base-image/build/conf/templateconf.cfg | 1 - base-image/meta-nodejs | 1 - .../meta-resin-supervisor/COPYING.Apache-2.0 | 204 ---------------- .../meta-resin-supervisor/conf/layer.conf | 8 - .../recipes-devtools/nodejs/nodejs_%.bbappend | 1 - .../rsync-3.1.2-max-128-basis-dirs.patch | 30 --- .../recipes-devtools/rsync/rsync_%.bbappend | 4 - base-image/oe-core | 1 - dindctl | 3 - 24 files changed, 2 insertions(+), 670 deletions(-) delete mode 160000 base-image/bitbake delete mode 100755 base-image/build.sh delete mode 100644 base-image/build/conf/bblayers.conf delete mode 100644 base-image/build/conf/local.conf delete mode 100644 base-image/build/conf/machine/generic-armv5.conf delete mode 100644 base-image/build/conf/machine/generic-armv6.conf delete mode 100644 base-image/build/conf/machine/generic-armv7hf.conf delete mode 100644 base-image/build/conf/machine/generic-armv8.conf delete mode 100644 base-image/build/conf/machine/generic-x86-64.conf delete mode 100644 base-image/build/conf/machine/generic-x86.conf delete mode 100644 base-image/build/conf/machine/i386-nlp.conf delete mode 100644 base-image/build/conf/templateconf.cfg delete mode 160000 base-image/meta-nodejs delete mode 100644 base-image/meta-resin-supervisor/COPYING.Apache-2.0 delete mode 100644 base-image/meta-resin-supervisor/conf/layer.conf delete mode 100644 base-image/meta-resin-supervisor/recipes-devtools/nodejs/nodejs_%.bbappend delete mode 100644 base-image/meta-resin-supervisor/recipes-devtools/rsync/rsync/rsync-3.1.2-max-128-basis-dirs.patch delete mode 100644 base-image/meta-resin-supervisor/recipes-devtools/rsync/rsync_%.bbappend delete mode 160000 base-image/oe-core diff --git a/.gitmodules b/.gitmodules index e75276c0..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +0,0 @@ -[submodule "base-image/meta-nodejs"] - path = base-image/meta-nodejs - url = https://github.com/imyller/meta-nodejs.git - branch = krogoth -[submodule "base-image/oe-core"] - path = base-image/oe-core - url = git://git.openembedded.org/openembedded-core - branch = krogoth -[submodule "base-image/bitbake"] - path = base-image/bitbake - url = git://git.openembedded.org/bitbake diff --git a/Dockerfile b/Dockerfile index 2c946c23..8ee6e2ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,45 +1,4 @@ ARG ARCH=amd64 -FROM debian:jessie-20170723 as base -ARG ARCH -# Install the following utilities (required by openembedded) -# http://www.openembedded.org/wiki/Getting_started#Ubuntu_.2F_Debian -RUN apt-get -qq update \ - && apt-get -qq install -y \ - build-essential \ - chrpath \ - cpio \ - curl \ - diffstat \ - file \ - gawk \ - git-core \ - libsdl1.2-dev \ - locales \ - python3 \ - texinfo \ - unzip \ - wget \ - xterm \ - sudo \ - && rm -rf /var/lib/apt/lists/* - -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LC_ALL en_US.UTF-8 - -ENV SOURCE_DIR /source -ENV DEST_DIR /dest -ENV SHARED_DOWNLOADS /yocto/shared-downloads -ENV SHARED_SSTATE /yocto/shared-sstate - -ARG BUILDER_UID=1000 -ARG BUILDER_GID=1000 - -COPY base-image /source -RUN cd /source && bash -ex build.sh - -############################################################################## - # Build golang supervisor FROM debian:jessie-20170723 as gosuper @@ -201,15 +160,13 @@ RUN [ "cross-build-end" ] ############################################################################## # Minimal runtime image -FROM scratch +FROM resin/$ARCH-supervisor-base:v1.1.0 ARG ARCH ARG VERSION=master ARG DEFAULT_PUBNUB_PUBLISH_KEY=pub-c-bananas ARG DEFAULT_PUBNUB_SUBSCRIBE_KEY=sub-c-bananas ARG DEFAULT_MIXPANEL_TOKEN=bananasbananas -COPY --from=base /dest/ / - WORKDIR /usr/src/app COPY --from=node-build /usr/src/app/dist ./dist @@ -229,5 +186,3 @@ ENV CONFIG_MOUNT_POINT=/boot/config.json \ HEALTHCHECK --interval=5m --start-period=1m --timeout=30s --retries=3 \ CMD wget -qO- http://127.0.0.1:${LISTEN_PORT:-48484}/v1/healthy || exit 1 - -CMD [ "/sbin/init" ] diff --git a/Makefile b/Makefile index 126ecfbd..e079ce82 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,6 @@ # Build targets (require Docker 17.05 or greater): # * supervisor (default) - builds a resin-supervisor image # * deploy - pushes a resin-supervisor image to the registry, retrying up to 3 times -# * base - builds the "base" component (a yocto builder with the output rootfs at /dest) # * gosuper - builds the "gosuper" component (a golang image with the Go supervisor component at /go/bin/gosuper and /build/gosuper) # * nodedeps, nodebuild - builds the node component, with the node_modules and src at /usr/src/app and /build (also includes a rootfs-overlay there) # * supervisor-dind: build the development docker-in-docker supervisor that run-supervisor uses (requires a SUPERVISOR_IMAGE to be available locally) @@ -188,9 +187,6 @@ supervisor: deploy: @bash retry_docker_push.sh $(IMAGE) -base: - $(MAKE) -f $(THIS_FILE) TARGET_COMPONENT=base IMAGE=$(IMAGE) ARCH=$(ARCH) supervisor-image - nodedeps: $(MAKE) -f $(THIS_FILE) TARGET_COMPONENT=node-deps IMAGE=$(IMAGE) ARCH=$(ARCH) supervisor-image @@ -226,4 +222,4 @@ test-integration: gosuper $(IMAGE) \ go test -v ./supertest -.PHONY: supervisor deploy base nodedeps nodebuild gosuper supervisor-dind run-supervisor +.PHONY: supervisor deploy nodedeps nodebuild gosuper supervisor-dind run-supervisor diff --git a/automation/build.sh b/automation/build.sh index 56f55dac..d9711c45 100755 --- a/automation/build.sh +++ b/automation/build.sh @@ -17,7 +17,6 @@ # Will produce and push an image tagged as resin/$ARCH-supervisor:$TAG # # It pulls intermediate images for caching, if available: -# resin/$ARCH-supervisor-base:$TAG # resin/$ARCH-supervisor-node:$TAG # resin/$ARCH-supervisor-go:$TAG # @@ -31,11 +30,6 @@ # # Requires docker >= 17.05, and make. # -# If you just cloned the repo, run this to populate the yocto dependencies before running this script: -# git submodule update --init --recursive -# git clean -fxd base-image -# git submodule foreach --recursive git clean -fxd -# set -e @@ -53,19 +47,16 @@ function tryRemove() { TARGET_IMAGE=resin/$ARCH-supervisor:$TAG # Intermediate images and cache -BASE_IMAGE=resin/$ARCH-supervisor-base:$TAG NODE_IMAGE=resin/$ARCH-supervisor-node:$TAG NODE_BUILD_IMAGE=resin/$ARCH-supervisor-node:$TAG-build GO_IMAGE=resin/$ARCH-supervisor-go:$TAG TARGET_CACHE=$TARGET_IMAGE -BASE_CACHE=$BASE_IMAGE GO_CACHE=$GO_IMAGE NODE_CACHE=$NODE_IMAGE NODE_BUILD_CACHE=$NODE_BUILD_IMAGE TARGET_CACHE_MASTER=resin/$ARCH-supervisor:master -BASE_CACHE_MASTER=resin/$ARCH-supervisor-base:master GO_CACHE_MASTER=resin/$ARCH-supervisor-go:master NODE_CACHE_MASTER=resin/$ARCH-supervisor-node:master NODE_BUILD_CACHE_MASTER=resin/$ARCH-supervisor-node:master-build @@ -82,8 +73,6 @@ function tryPullForCache() { # Only if the pull succeeds we add a --cache-from option tryPullForCache $TARGET_CACHE tryPullForCache $TARGET_CACHE_MASTER -tryPullForCache $BASE_CACHE -tryPullForCache $BASE_CACHE_MASTER tryPullForCache $GO_CACHE tryPullForCache $GO_CACHE_MASTER tryPullForCache $NODE_CACHE @@ -101,12 +90,6 @@ export PUBNUB_PUBLISH_KEY export PUBNUB_SUBSCRIBE_KEY export MIXPANEL_TOKEN -make IMAGE=$BASE_IMAGE base -if [ "$PUSH_IMAGES" = "true" ]; then - make IMAGE=$BASE_IMAGE deploy || true -fi -export DOCKER_BUILD_OPTIONS="${DOCKER_BUILD_OPTIONS} --cache-from ${BASE_IMAGE}" - make IMAGE=$GO_IMAGE gosuper if [ "$PUSH_IMAGES" = "true" ]; then make IMAGE=$GO_IMAGE deploy || true @@ -140,13 +123,11 @@ fi if [ "$CLEANUP" = "true" ]; then tryRemove $TARGET_IMAGE - tryRemove $BASE_IMAGE tryRemove $GO_IMAGE tryRemove $NODE_IMAGE tryRemove $NODE_BUILD_IMAGE tryRemove $TARGET_CACHE - tryRemove $BASE_CACHE tryRemove $GO_CACHE tryRemove $NODE_BUILD_CACHE tryRemove $NODE_CACHE diff --git a/base-image/bitbake b/base-image/bitbake deleted file mode 160000 index 25859009..00000000 --- a/base-image/bitbake +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25859009b710cb35ac8f9ee9eb3a7305f9e13402 diff --git a/base-image/build.sh b/base-image/build.sh deleted file mode 100755 index c97927df..00000000 --- a/base-image/build.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -set -o errexit - -BUILD_DIR='/home/builder/tmp' - -case "$ARCH" in -'amd64') - export TARGET_MACHINE='generic-x86-64' -;; -'i386') - export TARGET_MACHINE='generic-x86' -;; -'rpi') - export TARGET_MACHINE='generic-armv6' -;; -'armv7hf') - export TARGET_MACHINE='generic-armv7hf' -;; -'armel') - export TARGET_MACHINE='generic-armv5' -;; -'aarch64') - export TARGET_MACHINE='generic-armv8' -;; -'i386-nlp') - export TARGET_MACHINE='i386-nlp' -;; -esac - -export SOURCE_DIR=/source -export DEST_DIR=/dest -export SHARED_DOWNLOADS=/yocto/shared-downloads -export SHARED_SSTATE=/yocto/shared-sstate -# Make sure shared directories are in place -mkdir -p $SHARED_DOWNLOADS -mkdir -p $SHARED_SSTATE -mkdir -p $DEST_DIR - -groupadd -g $BUILDER_GID builder -useradd -m -u $BUILDER_UID -g $BUILDER_GID builder -sudo -H -u builder \ - /bin/bash -c "mkdir -p $BUILD_DIR \ - && cp -r $SOURCE_DIR/* $BUILD_DIR/ \ - && cd $BUILD_DIR \ - && source oe-core/oe-init-build-env build bitbake \ - && DL_DIR=$SHARED_DOWNLOADS SSTATE_DIR=$SHARED_SSTATE MACHINE=$TARGET_MACHINE $BUILD_DIR/bitbake/bin/bitbake core-image-minimal > /dev/null" -tar xzf $BUILD_DIR/build/tmp-glibc/deploy/images/$TARGET_MACHINE/core-image-minimal-$TARGET_MACHINE.tar.gz -C $DEST_DIR -# Delete the sstate and downloads directory so that the resulting image isn't huge -# If https://github.com/moby/moby/issues/32507 gets implemented we can start using -# a bind mounted cached directory instead -rm -rf $SHARED_DOWNLOADS -rm -rf $SHARED_SSTATE -rm -rf $BUILD_DIR diff --git a/base-image/build/conf/bblayers.conf b/base-image/build/conf/bblayers.conf deleted file mode 100644 index a3f8e0ef..00000000 --- a/base-image/build/conf/bblayers.conf +++ /dev/null @@ -1,12 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "7" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -BBLAYERS ?= " \ - ${TOPDIR}/../oe-core/meta \ - ${TOPDIR}/../meta-nodejs \ - ${TOPDIR}/../meta-resin-supervisor \ - " diff --git a/base-image/build/conf/local.conf b/base-image/build/conf/local.conf deleted file mode 100644 index 7518e030..00000000 --- a/base-image/build/conf/local.conf +++ /dev/null @@ -1,225 +0,0 @@ -# -# This file is your local configuration file and is where all local user settings -# are placed. The comments in this file give some guide to the options a new user -# to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. -# -# Lines starting with the '#' character are commented out and in some cases the -# default values are provided as comments to show people example syntax. Enabling -# the option is a question of removing the # character and making any change to the -# variable as required. - - -PREFERRED_PROVIDER_virtual/kernel="linux-dummy" - -# -# Machine Selection -# -# You need to select a specific machine to target the build with. There are a selection -# of emulated machines available which can boot and run in the QEMU emulator: -# -#MACHINE ?= "qemuarm" -#MACHINE ?= "qemuarm64" -#MACHINE ?= "qemumips" -#MACHINE ?= "qemumips64" -#MACHINE ?= "qemuppc" -#MACHINE ?= "qemux86" -#MACHINE ?= "qemux86-64" -# -# This sets the default machine to be qemux86 if no other machine is selected: -# MACHINE ??= "" - -# -# Where to place downloads -# -# During a first build the system will download many different source code tarballs -# from various upstream projects. This can take a while, particularly if your network -# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you -# can preserve this directory to speed up this part of subsequent builds. This directory -# is safe to share between multiple builds on the same machine too. -# -# The default is a downloads directory under TOPDIR which is the build directory. -# -#DL_DIR ?= "${TOPDIR}/downloads" - -# -# Where to place shared-state files -# -# BitBake has the capability to accelerate builds based on previously built output. -# This is done using "shared state" files which can be thought of as cache objects -# and this option determines where those files are placed. -# -# You can wipe out TMPDIR leaving this directory intact and the build would regenerate -# from these files if no changes were made to the configuration. If changes were made -# to the configuration, only shared state files where the state was still valid would -# be used (done using checksums). -# -# The default is a sstate-cache directory under TOPDIR. -# -#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" - -# -# Where to place the build output -# -# This option specifies where the bulk of the building work should be done and -# where BitBake should place its temporary files and output. Keep in mind that -# this includes the extraction and compilation of many applications and the toolchain -# which can use Gigabytes of hard disk space. -# -# The default is a tmp directory under TOPDIR. -# -#TMPDIR = "${TOPDIR}/tmp" - - -# -# Package Management configuration -# -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used -# to generate the root filesystems. -# Options are: -# - 'package_deb' for debian style deb files -# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) -# - 'package_rpm' for rpm style packages -# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to ipk: -PACKAGE_CLASSES ?= "package_ipk" - -# -# SDK target architecture -# -# This variable specifies the architecture to build SDK items for and means -# you can build the SDK packages for architectures other than the machine you are -# running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 -#SDKMACHINE ?= "i686" - -# -# Extra image configuration defaults -# -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated -# images. Some of these options are added to certain image types automatically. The -# variable can contain the following options: -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages -# (useful if you want to run the package test suites) -# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) -# "tools-debug" - add debugging tools (gdb, strace) -# "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) -# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) -# "debug-tweaks" - make an image suitable for development -# e.g. ssh root access has a blank password -# There are other application targets that can be used here too, see -# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. -# We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES ?= "debug-tweaks" - -# -# Additional image features -# -# The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable -# are: -# - 'buildstats' collect build statistics -# - 'image-mklibs' to reduce shared library files size for an image -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -# image-prelink disabled for now due to issues with IFUNC symbol relocation -USER_CLASSES ?= "buildstats image-mklibs" -IMAGE_FSTYPES ?= "tar.gz" - - -# -# Runtime testing of images -# -# The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" -# -# Interactive shell configuration -# -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is -# multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is iterate over the available -# terminal types to find one that works. -# -# Examples of the occasions this may happen are when resolving patches which cannot -# be applied, to use the devshell or the kernel menuconfig -# -# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none -# Note: currently, Konsole support only works for KDE 3.x due to the way -# newer Konsole versions behave -#OE_TERMINAL = "auto" -# By default disable interactive patch resolution (tasks will just fail instead): -PATCHRESOLVE = "noop" - -# -# Disk Space Monitoring during the build -# -# Monitor the disk space during the build. If there is less that 1GB of space or less -# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort -# of the build. The reason for this is that running completely out of space can corrupt -# files and damages the build in ways which may not be easily recoverable. -# It's necesary to monitor /tmp, if there is no space left the build will fail -# with very exotic errors. -BB_DISKMON_DIRS = "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" - -# -# Shared-state files from other locations -# -# As mentioned above, shared state files are prebuilt cache data objects which can -# used to accelerate build time. This variable can be used to configure the system -# to search other mirror locations for these objects before it builds the data itself. -# -# This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the -# cache locations to check for the shared objects. -# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH -# at the end as shown in the examples below. This will be substituted with the -# correct path within the directory structure. -#SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ -#file://.* file:///some/local/dir/sstate/PATH" - - -# -# Qemu configuration -# -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. By default libsdl-native will -# be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl-native then uncomment the ASSUME_PROVIDED line below. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" - -# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -# track the version of this file when it was generated. This can safely be ignored if -# this doesn't mean anything to you. -CONF_VERSION = "1" - -IMAGE_INSTALL_append += " btrfs-tools ca-certificates iptables nodejs rsync" -VIRTUAL-RUNTIME_init_manager="busybox" -VIRTUAL-RUNTIME_dev_manager="busybox-mdev" -PREFERRED_VERSION_nodejs = "6.5.0" diff --git a/base-image/build/conf/machine/generic-armv5.conf b/base-image/build/conf/machine/generic-armv5.conf deleted file mode 100644 index 09849d77..00000000 --- a/base-image/build/conf/machine/generic-armv5.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: Generic armv5te machine -#@DESCRIPTION: Machine configuration for armv5te based boards - -require conf/machine/include/arm/arch-armv5.inc - -DEFAULTTUNE = "armv5t-vfp" diff --git a/base-image/build/conf/machine/generic-armv6.conf b/base-image/build/conf/machine/generic-armv6.conf deleted file mode 100644 index ff41da90..00000000 --- a/base-image/build/conf/machine/generic-armv6.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: Generic armv6 machine -#@DESCRIPTION: Machine configuration for armv6 based boards - -require conf/machine/include/arm/arch-armv6.inc - -DEFAULTTUNE = "armv6thf" diff --git a/base-image/build/conf/machine/generic-armv7hf.conf b/base-image/build/conf/machine/generic-armv7hf.conf deleted file mode 100644 index 0531ccc7..00000000 --- a/base-image/build/conf/machine/generic-armv7hf.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: Generic armv7a hard float machine -#@DESCRIPTION: Machine configuration for armv7a based boards - -require conf/machine/include/arm/arch-armv7a.inc - -DEFAULTTUNE = "armv7athf-vfpv3d16" diff --git a/base-image/build/conf/machine/generic-armv8.conf b/base-image/build/conf/machine/generic-armv8.conf deleted file mode 100644 index 18e3793e..00000000 --- a/base-image/build/conf/machine/generic-armv8.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: Generic armv8 machine -#@DESCRIPTION: Machine configuration for armv8 based boards - -require conf/machine/include/arm/arch-armv8.inc - -DEFAULTTUNE = "aarch64" diff --git a/base-image/build/conf/machine/generic-x86-64.conf b/base-image/build/conf/machine/generic-x86-64.conf deleted file mode 100644 index 935817af..00000000 --- a/base-image/build/conf/machine/generic-x86-64.conf +++ /dev/null @@ -1,6 +0,0 @@ -#@TYPE: Machine -#@NAME: common_pc -#@DESCRIPTION: Machine configuration for running a common x86 - -DEFAULTTUNE ?= "core2-64" -require conf/machine/include/tune-core2.inc diff --git a/base-image/build/conf/machine/generic-x86.conf b/base-image/build/conf/machine/generic-x86.conf deleted file mode 100644 index 671afd9c..00000000 --- a/base-image/build/conf/machine/generic-x86.conf +++ /dev/null @@ -1,5 +0,0 @@ -#@TYPE: Machine -#@NAME: common_pc -#@DESCRIPTION: Machine configuration for running a common x86 - -require conf/machine/include/tune-i586.inc diff --git a/base-image/build/conf/machine/i386-nlp.conf b/base-image/build/conf/machine/i386-nlp.conf deleted file mode 100644 index 4483ac73..00000000 --- a/base-image/build/conf/machine/i386-nlp.conf +++ /dev/null @@ -1,5 +0,0 @@ -#@TYPE: Machine -#@NAME: common_pc -#@DESCRIPTION: Machine configuration for x86 with quark cpu boards. - -require conf/machine/include/tune-i586-nlp.inc diff --git a/base-image/build/conf/templateconf.cfg b/base-image/build/conf/templateconf.cfg deleted file mode 100644 index 50d42589..00000000 --- a/base-image/build/conf/templateconf.cfg +++ /dev/null @@ -1 +0,0 @@ -meta/conf diff --git a/base-image/meta-nodejs b/base-image/meta-nodejs deleted file mode 160000 index 65ccd459..00000000 --- a/base-image/meta-nodejs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 65ccd459ecff3fd5958509e535426135fa1381be diff --git a/base-image/meta-resin-supervisor/COPYING.Apache-2.0 b/base-image/meta-resin-supervisor/COPYING.Apache-2.0 deleted file mode 100644 index b3201abf..00000000 --- a/base-image/meta-resin-supervisor/COPYING.Apache-2.0 +++ /dev/null @@ -1,204 +0,0 @@ - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don`t include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/base-image/meta-resin-supervisor/conf/layer.conf b/base-image/meta-resin-supervisor/conf/layer.conf deleted file mode 100644 index f4ed3ca2..00000000 --- a/base-image/meta-resin-supervisor/conf/layer.conf +++ /dev/null @@ -1,8 +0,0 @@ -BBPATH .= ":${LAYERDIR}" - -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "resin-supervisor" -BBFILE_PATTERN_resin-supervisor := "^${LAYERDIR}/" -BBFILE_PRIORITY_resin-supervisor = "1337" diff --git a/base-image/meta-resin-supervisor/recipes-devtools/nodejs/nodejs_%.bbappend b/base-image/meta-resin-supervisor/recipes-devtools/nodejs/nodejs_%.bbappend deleted file mode 100644 index 05ccb19c..00000000 --- a/base-image/meta-resin-supervisor/recipes-devtools/nodejs/nodejs_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -GYP_DEFINES_append_x86 = " v8_target_arch='x87' " diff --git a/base-image/meta-resin-supervisor/recipes-devtools/rsync/rsync/rsync-3.1.2-max-128-basis-dirs.patch b/base-image/meta-resin-supervisor/recipes-devtools/rsync/rsync/rsync-3.1.2-max-128-basis-dirs.patch deleted file mode 100644 index c54ee6f1..00000000 --- a/base-image/meta-resin-supervisor/recipes-devtools/rsync/rsync/rsync-3.1.2-max-128-basis-dirs.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c630e487ba704fdd45d441ccfff4e678eacba758 Mon Sep 17 00:00:00 2001 -From: Pablo Carranza Velez -Date: Thu, 8 Dec 2016 23:27:59 -0300 -Subject: [PATCH] Change maximum amount of basis directories to 128. - -It is 1 more than the maximum number of docker layers, which allows - performing hardlink copies of docker images using rsync. - Also it's a power of 2 so it's a prettier number. - -Signed-off-by: Pablo Carranza Velez ---- - rsync.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rsync.h b/rsync.h -index 6e1e1dd..36a2097 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -148,7 +148,7 @@ - #define IOERR_DEL_LIMIT (1<<2) - - #define MAX_ARGS 1000 --#define MAX_BASIS_DIRS 20 -+#define MAX_BASIS_DIRS 128 - #define MAX_SERVER_ARGS (MAX_BASIS_DIRS*2 + 100) - - #define MPLEX_BASE 7 --- -2.5.0 - diff --git a/base-image/meta-resin-supervisor/recipes-devtools/rsync/rsync_%.bbappend b/base-image/meta-resin-supervisor/recipes-devtools/rsync/rsync_%.bbappend deleted file mode 100644 index 3a70319c..00000000 --- a/base-image/meta-resin-supervisor/recipes-devtools/rsync/rsync_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI_append = " \ - file://rsync-3.1.2-max-128-basis-dirs.patch \ - " diff --git a/base-image/oe-core b/base-image/oe-core deleted file mode 160000 index dd330056..00000000 --- a/base-image/oe-core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dd330056ace289c8a9c5d77b6bb6e860b9f0913e diff --git a/dindctl b/dindctl index 77de1a55..7d9d3d75 100755 --- a/dindctl +++ b/dindctl @@ -112,9 +112,6 @@ function parseOptions { function buildSupervisor { echo "Building and deploying for architecture $ARCH and tagging as $TAG" - git submodule update --init --recursive - git clean -fxd base-image - git submodule foreach --recursive git clean -fxd ARCH="$ARCH" TAG="$TAG" bash automation/build.sh }