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

Merge pull request #301 from marineam/dev

Browse Source 
Fixes/cleanups for package building
This commit is contained in:
Michael Marineau 2014-07-19 15:27:43 -07:00
commit 5446f7f06a
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_packages
View File

@ -231,6 +231,9 @@ break_dep_loop() {
sudo rm -f "${flag_file}" sudo rm -f "${flag_file}"
} }
# util-linux[udev] -> virtual->udev -> systemd -> util-linux
break_dep_loop sys-apps/util-linux udev
# systemd[cryptsetup] -> cryptsetup -> lvm2 -> virtual/udev -> systemd # systemd[cryptsetup] -> cryptsetup -> lvm2 -> virtual/udev -> systemd
break_dep_loop sys-apps/systemd cryptsetup break_dep_loop sys-apps/systemd cryptsetup

19
setup_board
View File

@ -93,19 +93,6 @@ generate_all_wrappers() {
info "Generating wrapper scripts" info "Generating wrapper scripts"
wrapper="/usr/local/bin/pkg-config-${BOARD_VARIANT}"
sudo_clobber "${wrapper}" <<EOF
#!/bin/bash
PKG_CONFIG_LIBDIR=\$(printf '%s:' "${BOARD_ROOT}"/usr/*/pkgconfig)
export PKG_CONFIG_LIBDIR
export PKG_CONFIG_SYSROOT_DIR="${BOARD_ROOT}"
exec pkg-config "\$@"
EOF
wrappers+=( "${wrapper}" )
for wrapper in 'emerge --root-deps' ebuild eclean equery portageq \ for wrapper in 'emerge --root-deps' ebuild eclean equery portageq \
qcheck qfile qlist; do qcheck qfile qlist; do
_generate_wrapper ${wrapper} _generate_wrapper ${wrapper}
@ -263,12 +250,6 @@ PORT_LOGDIR="${BOARD_ROOT}/var/log/portage"
PORTAGE_TMPDIR="${BOARD_ROOT}/var/tmp" PORTAGE_TMPDIR="${BOARD_ROOT}/var/tmp"
PORTAGE_BINHOST="${BOARD_BINHOST}" PORTAGE_BINHOST="${BOARD_BINHOST}"
# TODO(marineam): Unsure if we need to specify both the pkg-config
# env variables and a pkg-config wrapper that does the same thing...
PKG_CONFIG="pkg-config-${BOARD_VARIANT}"
PKG_CONFIG_PATH="${BOARD_ROOT}/usr/lib/pkgconfig:${BOARD_ROOT}/usr/share/pkgconfig"
PKG_CONFIG_SYSROOT_DIR="${BOARD_ROOT}"
# Generally there isn't any need to add packages to @world by default. # Generally there isn't any need to add packages to @world by default.
# You can use --select to override this. # You can use --select to override this.
EMERGE_DEFAULT_OPTS="--oneshot" EMERGE_DEFAULT_OPTS="--oneshot"