diff options
| author | Mark Ferrell <major@homeonderanged.org> | 2012-04-18 01:01:13 -0500 |
|---|---|---|
| committer | Mark Ferrell <major@homeonderanged.org> | 2012-04-18 01:01:13 -0500 |
| commit | 8e8333b8dc75777eb39910443f5267eb59dbadeb (patch) | |
| tree | 4d94b52397d0ca8ab3e3dec78f968197e7312f9f | |
| parent | 030d98cd0703bec10239001a6893c03a688dc09c (diff) | |
Include package category in artifact path
* Instead of relying on CBUILD and CHOST it is easier to simply archive
packages within their category inside of the artifact directory.
| -rwxr-xr-x | scripts/builder/build-archive | 12 | ||||
| -rwxr-xr-x | scripts/builder/build-install | 4 | ||||
| -rwxr-xr-x | scripts/builder/build-makedeps | 7 |
3 files changed, 9 insertions, 14 deletions
diff --git a/scripts/builder/build-archive b/scripts/builder/build-archive index 53439d7..8c0400e 100755 --- a/scripts/builder/build-archive +++ b/scripts/builder/build-archive @@ -26,17 +26,17 @@ case "${ARCHIVE_FORMAT}" in (*) die "unsupported archive format '${ARCHIVE_FORMAT}'";; esac -if [ ! -d "${BUILDER_ATFDIR}" ]; then - mkdir -p "${BUILDER_ATFDIR}" +if [ ! -d "${BUILDER_ATFDIR}/${CATEGORY}" ]; then + mkdir -p "${BUILDER_ATFDIR}/${CATEGORY}" fi cd "${D}" tar -cvf "${ARCHIVE_TMP1}" . > "${L}/archive.log" 2>&1 ${ARCHIVE_COMPRESSOR} "${ARCHIVE_TMP1}" > "${ARCHIVE_TMP2}" 2>> "${L}/archive.log" -if [ -f "${BUILDER_ATFDIR}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" ]; then - rm -f "${BUILDER_ATFDIR}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" +if [ -f "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" ]; then + rm -f "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" fi -mv -v "${ARCHIVE_TMP2}" "${BUILDER_ATFDIR}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" >> "${L}/archive.log" 2>&1 -touch -r "${W}/.compiled" "${BUILDER_ATFDIR}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" +mv -v "${ARCHIVE_TMP2}" "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" >> "${L}/archive.log" 2>&1 +touch -r "${W}/.compiled" "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" # vim: filetype=sh diff --git a/scripts/builder/build-install b/scripts/builder/build-install index d84af09..ed8232a 100755 --- a/scripts/builder/build-install +++ b/scripts/builder/build-install @@ -3,7 +3,7 @@ echo "installing: ${1}" eval $(build query --environ "${1}") -[ -f "${BUILDER_ATFDIR}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" ] || die "archive does not exist for package '${NAME}'" +[ -f "${BUILDER_ATFDIR}/${CATEGOR}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" ] || die "archive does not exist for package '${NAME}'" if [ ! -d "${SYSROOT}" ]; then mkdir -p "${SYSROOT}" || die "failed to create system root @ '${SYSROOT}'" fi @@ -25,7 +25,7 @@ else cd "${SYSROOT}" fi -${ARCHIVE_DECOMPRESSOR} "${BUILDER_ATFDIR}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" | tar x +${ARCHIVE_DECOMPRESSOR} "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" | tar x cp -a "${W}/.compiled" "${W}/.installed" # vim: filetype=sh diff --git a/scripts/builder/build-makedeps b/scripts/builder/build-makedeps index c12ed17..f0f5adf 100755 --- a/scripts/builder/build-makedeps +++ b/scripts/builder/build-makedeps @@ -36,17 +36,12 @@ for package in $(cd "${BUILDER_PKGDIR}" && echo */*); do fi package_make="$(echo "${package}"|tr '/-' '__')" + package_archive="${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" package_install="${W}/.installed" package_compile="${W}/.compiled" package_prep="${W}/.prepped" package_logdir="${L}" - if [ -z "${TOOLCHAIN}" ]; then - package_archive="${BUILDER_ATFDIR}/${CHOST}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" - else - package_archive="${BUILDER_ATFDIR}/${CBUILD}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" - fi - package_sources="${RULESFILE}" for patch in ${PATCHES}; do patch="${F}/${NAME}-${VERSION}-${patch}.patch" |