-
Notifications
You must be signed in to change notification settings - Fork 315
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixes the functional test suite #113
Conversation
This commit fixes the functional test suite, along with some cleanup for bldr-build as a whole. * It adds a 'make bldr' target in plans, which will generate a bldr package and image. * It checks for the gnu version of sort and mktemp. This fixes a bug if busybox is installed. * It prefers installed packages over the repository. If a pacakge for a dep already exists, we use it. We only install if we don't have one. This is probably not the right behavior long term (you would want to look at the local version and the remote, make sure they are the same, and install if they aren't) * Adds a plan for patchelf * Adds a set_rpath() function to bldr-build that uses patchelf to patch binaries if it exists. * Fixes a bug with the generated docker container that was not using the qualified form of a service on startup * Restores the Dockerfile needed to build a bldr/base image. * Copies only the files that make up the latest package for every package we need in the base image, making the resulting image small again. * Lets the bldr package not install bldr twice; assumes we either have the dependencies, or we are building from scratch. * Ignores a doc-test that was failing due to not having a macro imported, that wasn't trying to run prior to rust 1.5.
@@ -4,12 +4,13 @@ pkg_version=5.2.1 | |||
pkg_license=('GPLv2' 'LGPLv2.1') | |||
pkg_source=http://ftp.gnu.org/gnu/libc/${pkg_name}-${pkg_version}.tar.bz2 | |||
pkg_deps=(chef/glibc chef/libgcc) | |||
pkg_dev_deps=(chef/patchelf) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably pkg_build_deps=(chef/patchelf)
?
This PR has passed 'Verify' and is ready for review and approval! |
A few small things here, but I'll circle back to these on my next PR. In the interests of a green pipeline, I'm going to @delivery approve |
Failed to unknown change: afd293a2-0443-4773-9e08-9b67609a14c7 |
@delivery approve |
Merged change afd293a2-0443-4773-9e08-9b67609a14c7 From review branch fix-tests into master Signed-off-by: fnichol <[email protected]>
Change: afd293a2-0443-4773-9e08-9b67609a14c7 approved by: @fnichol |
Geez @delivery, get with the GIFs why don't 'cha? |
Failed to unknown change: afd293a2-0443-4773-9e08-9b67609a14c7 |
This commit fixes the functional test suite, along with some cleanup for
bldr-build as a whole.
package and image.
installed.
dep already exists, we use it. We only install if we don't have one.
This is probably not the right behavior long term (you would want to
look at the local version and the remote, make sure they are the same,
and install if they aren't)
binaries if it exists.
qualified form of a service on startup
package we need in the base image, making the resulting image small
again.
the dependencies, or we are building from scratch.
imported, that wasn't trying to run prior to rust 1.5.