mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 07:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58 from marineam/baselayout

Browse Source 
Baselayout/release file fixes
This commit is contained in:
polvi 2013-07-25 21:14:35 -07:00
commit 7ed28ac286
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_library/base_image_util.sh
View File

@ -163,6 +163,11 @@ create_base_image() {
sudo mkdir -p "${root_fs_dir}/usr/share/oem" sudo mkdir -p "${root_fs_dir}/usr/share/oem"
sudo mount --bind "${oem_fs_dir}" "${root_fs_dir}/usr/share/oem" sudo mount --bind "${oem_fs_dir}" "${root_fs_dir}/usr/share/oem"
# First thing first, install baselayout with USE=build to create a
# working directory tree. Don't use binpkgs due to the use flag change.
sudo -E USE=build ${EMERGE_BOARD_CMD} --root="${root_fs_dir}" \
--usepkg=n --buildpkg=n --oneshot --quiet --nodeps sys-apps/baselayout
# We need to install libc manually from the cross toolchain. # We need to install libc manually from the cross toolchain.
# TODO: Improve this? It would be ideal to use emerge to do this. # TODO: Improve this? It would be ideal to use emerge to do this.
PKGDIR="/var/lib/portage/pkgs" PKGDIR="/var/lib/portage/pkgs"
@ -181,6 +186,8 @@ create_base_image() {
'usr/include' 'sys-include' 'usr/include' 'sys-include'
# Link-time objects. # Link-time objects.
'*.[ao]' '*.[ao]'
# Empty lib dirs, replaced by symlinks
'lib'
) )
pbzip2 -dc --ignore-trailing-garbage=1 "${LIBC_PATH}" | \ pbzip2 -dc --ignore-trailing-garbage=1 "${LIBC_PATH}" | \
sudo tar xpf - -C "${root_fs_dir}" ./usr/${CHOST} \ sudo tar xpf - -C "${root_fs_dir}" ./usr/${CHOST} \

8
build_library/set_lsb_release
View File

@ -83,15 +83,15 @@ $COREOS_VERSION_NAME release $COREOS_VERSION_STRING
EOF EOF
# Aaaannd for the new systemd world order # Aaaannd for the new systemd world order
# os-release provides a seperate build-id field, so split it from version # os-release provides a separate build-id field, so split it from version
OS_ID=$(tr '[:upper:]' '[:lower:]' <<<"$COREOS_VERSION_NAME") OS_ID=$(tr '[:upper:]' '[:lower:]' <<<"$COREOS_VERSION_NAME")
OS_VERION_ID="${COREOS_VERSION_STRING#*+}" OS_VERSION_ID="${COREOS_VERSION_STRING%%+*}"
OS_BUILD_ID="${COREOS_VERSION_STRING%%+*}" OS_BUILD_ID="${COREOS_VERSION_STRING#*+}"
sudo_clobber "${ROOT_FS_DIR}/etc/os-release" <<EOF sudo_clobber "${ROOT_FS_DIR}/etc/os-release" <<EOF
NAME=$COREOS_VERSION_NAME NAME=$COREOS_VERSION_NAME
ID=$OS_ID ID=$OS_ID
VERSION=$COREOS_VERSION_STRING VERSION=$COREOS_VERSION_STRING
VERSION_ID=$OS_VERION_ID VERSION_ID=$OS_VERSION_ID
BUILD_ID=$OS_BUILD_ID BUILD_ID=$OS_BUILD_ID
PRETTY_NAME="$COREOS_VERSION_NAME $COREOS_VERSION_DESCRIPTION" PRETTY_NAME="$COREOS_VERSION_NAME $COREOS_VERSION_DESCRIPTION"
ANSI_COLOR="1;32" ANSI_COLOR="1;32"