diff options
| -rwxr-xr-x | bootstrap/bootstrap.sh | 6 | ||||
| -rwxr-xr-x | xib.sh | 23 |
2 files changed, 12 insertions, 17 deletions
diff --git a/bootstrap/bootstrap.sh b/bootstrap/bootstrap.sh index 2c244f1..011a893 100755 --- a/bootstrap/bootstrap.sh +++ b/bootstrap/bootstrap.sh @@ -61,13 +61,13 @@ FINDUTILS_VER=$(getversion findutils) CURL_OPTS="-SsL" -HOST=x86_64-linux-gnu +HOST=x86_64-linux-musl TARGET=x86_64-linux-musl ARCH=x86 CPU=x86-64 -CROSS_TOOLS=/cross-tools -TOOLS=/tools +CROSS_TOOLS=/xilinux/bootstrap/cross-tools +TOOLS=/xilinux/bootstrap/tools chroot=$(pwd)/chroot PATH=${TOOLS}/bin:${CROSS_TOOLS}/bin:/usr/bin @@ -4,9 +4,6 @@ [ -f /usr/lib/glyphs.sh ] && . /usr/lib/glyphs.sh [ -f /usr/lib/xilib.sh ] && . /usr/lib/xilib.sh -XIPKG_INSTALL=/usr/lib/xipkg/install.sh -[ -f $XIPKG_INSTALL ] && . $XIPKG_INSTALL - xib_dir="/var/lib/xib" build_profile="/etc/xib_profile.conf" @@ -137,7 +134,7 @@ package_install () { get_deps () { local package=$(get_package_build $1) [ -d $package ] && - sed -rn "s/^.*DEPS=\"(.*)\"/\1/p" $package/$1.xibuild + sed -rn "s/^MAKEDEPS=\"(.*)\"/\1/p" $package/$1.xibuild } # list dependencies of a list of packages @@ -191,16 +188,14 @@ xib_single () { local deps=$(get_deps $name) local missing="" - is_meta $package || { - for dep in $deps; do - [ -e "$chroot/var/lib/xipkg/installed/$dep" ] || { - pkgfile=$(get_package_file $dep) - [ "${#pkgfile}" = "0" ] && missing="$missing $dep" - printf "${LIGHT_GREEN}+${LIGHT_CYAN}install $dep" - package_install $dep $(get_package_file $dep) $chroot - } - done - } + for dep in $deps; do + [ -e "$chroot/var/lib/xipkg/installed/$dep" ] || { + pkgfile=$(get_package_file $dep) + [ "${#pkgfile}" = "0" ] && missing="$missing $dep" + printf "${LIGHT_GREEN}+${LIGHT_CYAN}install $dep" + package_install $dep $(get_package_file $dep) $chroot + } + done [ "${#missing}" != "0" ] && { printf "${RED}$name depends on these packages to be build before: ${LIGHT_RED}$missing\n" |