diff options
| author | P. J. McDermott <pjm@nac.net> | 2014-03-18 16:08:53 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2014-03-18 16:08:53 (EDT) |
| commit | 246f1eac4e32d074d33b1cf0b186397f61148b28 (patch) | |
| tree | 8b7d5b1cc1e0dd309bf2a65c61a36ce4aa4f3921 | |
| parent | bbb52cd4fe48c6f83e146fe037daef2572adccb8 (diff) | |
Don't install cross packages in stage2.
| -rwxr-xr-x | bootstrap-stage2-install.sh | 30 | ||||
| -rwxr-xr-x | bootstrap-stage2-test.sh | 15 |
2 files changed, 45 insertions, 0 deletions
diff --git a/bootstrap-stage2-install.sh b/bootstrap-stage2-install.sh index e288bf8..2c001ae 100755 --- a/bootstrap-stage2-install.sh +++ b/bootstrap-stage2-install.sh @@ -89,6 +89,21 @@ install_packages() ../root1/usr/src/*_all_all.opk; do [ -f "${opk}" ] || continue pkg="${opk#../root1/usr/src/}" + case "${pkg}" in + "build-essential-${ARCH}_"*) ;; + 'build-essential-common_'*) ;; + 'build-essential-'*) continue ;; + "gcc-${ARCH}_"*) ;; + "gcc-"*"-${ARCH}_"*) ;; + 'gcc-'*'-common_'*) ;; + 'gcc-'*'-locales_'*) ;; + 'gcc-'*) continue ;; + "g++-${ARCH}_"*) ;; + "g++-"*"-${ARCH}_"*) ;; + 'g++-'*'-common_'*) ;; + 'g++-'*'-locales_'*) ;; + 'g++-'*) continue ;; + esac log 'Installing package %s...' "${pkg%%_*}" tar -xzOf "${opk}" data.tar.gz | tar -xz done @@ -128,6 +143,21 @@ configure_packages() ../root1/usr/src/*_all_all.opk; do [ -f "${opk}" ] || continue pkg="${opk#../root1/usr/src/}" + case "${pkg}" in + "build-essential-${ARCH}_"*) ;; + 'build-essential-common_'*) ;; + 'build-essential-'*) continue ;; + "gcc-${ARCH}_"*) ;; + "gcc-"*"-${ARCH}_"*) ;; + 'gcc-'*'-common_'*) ;; + 'gcc-'*'-locales_'*) ;; + 'gcc-'*) continue ;; + "g++-${ARCH}_"*) ;; + "g++-"*"-${ARCH}_"*) ;; + 'g++-'*'-common_'*) ;; + 'g++-'*'-locales_'*) ;; + 'g++-'*) continue ;; + esac pkg="${pkg%%_*}" for entry in $(tar -xzOf "${opk}" control.tar.gz | tar -tz); do file="${entry##*/}" diff --git a/bootstrap-stage2-test.sh b/bootstrap-stage2-test.sh index dd68aac..8596c57 100755 --- a/bootstrap-stage2-test.sh +++ b/bootstrap-stage2-test.sh @@ -76,6 +76,21 @@ test_packages() ../root1/usr/src/*_all_${PLAT}.opk \ ../root1/usr/src/*_all_all.opk; do [ -f "${opk}" ] || continue + case "${opk#../root1/usr/src/}" in + "build-essential-${ARCH}_"*) ;; + 'build-essential-common_'*) ;; + 'build-essential-'*) continue ;; + "gcc-${ARCH}_"*) ;; + "gcc-"*"-${ARCH}_"*) ;; + 'gcc-'*'-common_'*) ;; + 'gcc-'*'-locales_'*) ;; + 'gcc-'*) continue ;; + "g++-${ARCH}_"*) ;; + "g++-"*"-${ARCH}_"*) ;; + 'g++-'*'-common_'*) ;; + 'g++-'*'-locales_'*) ;; + 'g++-'*) continue ;; + esac cp "${opk}" . done sudo chroot . sh -c 'opkg install /*.opk' |