mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 22:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1296 from glevand/for-merge-1

Browse Source 
coreos-overlay: fixes and updates
This commit is contained in:
Geoff Levand 2015-06-24 15:42:35 -07:00
commit 07f5d38a14
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -12,7 +12,7 @@ CROS_WORKON_LOCALNAME="docker"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
if [[ ${PV} == *9999 ]]; then if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT="" DOCKER_GITCOMMIT="unknown"
KEYWORDS="" KEYWORDS=""
else else
CROS_WORKON_COMMIT="0baf60984522744eed290348f33f396c046b2f3a" # v1.7.0 CROS_WORKON_COMMIT="0baf60984522744eed290348f33f396c046b2f3a" # v1.7.0
@ -154,6 +154,10 @@ src_prepare() {
epatch_user epatch_user
} }
go_get_arch() {
echo ${ARCH}
}
src_compile() { src_compile() {
# if we treat them right, Docker's build scripts will set up a # if we treat them right, Docker's build scripts will set up a
# reasonable GOPATH for us # reasonable GOPATH for us
@ -190,6 +194,11 @@ src_compile() {
unset DOCKER_EXPERIMENTAL unset DOCKER_EXPERIMENTAL
fi fi
export GOARCH=$(go_get_arch)
export CGO_ENABLED=1
export CC=$(tc-getCC)
export CXX=$(tc-getCXX)
# time to build! # time to build!
./hack/make.sh dynbinary || die 'dynbinary failed' ./hack/make.sh dynbinary || die 'dynbinary failed'

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild vendored
View File

@ -91,7 +91,7 @@ RDEPEND="${RDEPEND}
app-emulation/actool app-emulation/actool
app-emulation/rkt app-emulation/rkt
app-emulation/xenstore app-emulation/xenstore
app-emulation/xenserver-pv-version amd64? ( app-emulation/xenserver-pv-version )
sys-apps/findutils sys-apps/findutils
sys-apps/which sys-apps/which
app-admin/flannel app-admin/flannel

2
sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild vendored
View File

@ -15,7 +15,7 @@ IUSE=""
DEPEND="" DEPEND=""
RDEPEND=" RDEPEND="
app-emulation/open-vm-tools amd64? ( app-emulation/open-vm-tools )
coreos-base/coreos coreos-base/coreos
coreos-base/coreos-dev coreos-base/coreos-dev
dev-lang/python-oem dev-lang/python-oem

6
sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass vendored
View File

@ -65,7 +65,7 @@ get_bootengine_lib() {
# @FUNCTION: update_bootengine_cpio # @FUNCTION: update_bootengine_cpio
# @DESCRIPTION: # @DESCRIPTION:
# Append files in the given directory to the bootengine cpio. # Append files in the given directory to the bootengine cpio.
# Allows us to stick kernel modules into the initramfs built into bzImage. # Allows us to stick kernel modules into the initramfs built into the image.
update_bootengine_cpio() { update_bootengine_cpio() {
local extra_root="$1" local extra_root="$1"
local cpio_path="${KBUILD_OUTPUT}/bootengine.cpio" local cpio_path="${KBUILD_OUTPUT}/bootengine.cpio"
@ -84,7 +84,7 @@ update_bootengine_cpio() {
kmake() { kmake() {
local kernel_arch=$(tc-arch-kernel) local kernel_arch=$(tc-arch-kernel)
emake ARCH="${kernel_arch}" CROSS_COMPILE="${CHOST}-" "$@" emake LDFLAGS="" ARCH="${kernel_arch}" CROSS_COMPILE="${CHOST}-" "$@"
} }
# Discard the module signing key, we use new keys for each build. # Discard the module signing key, we use new keys for each build.
@ -153,7 +153,7 @@ coreos-kernel_src_compile() {
update_bootengine_cpio "${bootengine_root}" update_bootengine_cpio "${bootengine_root}"
# Build the final kernel image # Build the final kernel image
kmake bzImage kmake
} }
coreos-kernel_src_install() { coreos-kernel_src_install() {