diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/binary_debian-installer | 4 | ||||
| -rwxr-xr-x | scripts/build/binary_disk | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_iso | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_syslinux | 8 | ||||
| -rwxr-xr-x | scripts/build/bootstrap | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_apt | 12 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 8 | ||||
| -rwxr-xr-x | scripts/build/source_disk | 2 |
8 files changed, 20 insertions, 20 deletions
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer index 67122d9e7..c7d764476 100755 --- a/scripts/build/binary_debian-installer +++ b/scripts/build/binary_debian-installer @@ -272,10 +272,10 @@ case "${LB_DERIVATIVE}" in URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" fi - if [ "${LB_MODE}" = "progress" ] + if [ "${LB_MODE}" = "progress-linux" ] then # FIXME: normal derivatives probably don't rebuild d-i, - # but progress does. + # but progress-linux does. URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" fi ;; diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index e8e5c0ddc..c71338a90 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -72,7 +72,7 @@ case "${LB_MODE}" in TRACE="" ;; - progress) + progress-linux) TITLE="Progress Linux" STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}" TRACE="project/trace/archive-master.progress-linux.org" diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index c25674bbb..d9a277379 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -128,7 +128,7 @@ case "${LB_BOOTLOADER}" in syslinux) GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" case "${LB_MODE}" in - progress) + progress-linux) GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/boot.bin -c boot/boot.cat" GENISOIMAGE_EXCLUDE="boot/boot.bin" ;; diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 7c6c20c75..5836b0a26 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -53,7 +53,7 @@ case "${LB_BINARY_IMAGES}" in _BOOTLOADER="isolinux" case "${LB_MODE}" in - progress) + progress-linux) _TARGET="binary/boot" ;; @@ -72,7 +72,7 @@ case "${LB_BINARY_IMAGES}" in _BOOTLOADER="syslinux" case "${LB_MODE}" in - progress) + progress-linux) _TARGET="binary/boot" ;; @@ -273,7 +273,7 @@ fi if [ -e "${_TARGET}/splash.svg.in" ] then case "${LB_MODE}" in - progress) + progress-linux) _PROJECT="Progress Linux" if ls config/package-lists/client-gnome.list* @@ -350,7 +350,7 @@ then fi case "${LB_MODE}" in - progress) + progress-linux) for _FILE in "${_TARGET}/isolinux.bin" "${_TARGET}/isolinux.cfg" "${_TARGET}/syslinux.cfg" do if [ -e "${_FILE}" ] diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap index 260445afc..9d964006f 100755 --- a/scripts/build/bootstrap +++ b/scripts/build/bootstrap @@ -43,6 +43,6 @@ lb bootstrap_cache save ${@} # Temporary hack for base-files wrt/ plymouth case "${LB_DISTRIBUTION}" in artax*) - echo '0.0.0' > chroot/etc/progress_version + echo '0.0.0' > chroot/etc/progress-linux_version ;; esac diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt index 62fbd4e67..b31ab94ba 100755 --- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -147,8 +147,8 @@ case "${1}" in fi case "${LB_MODE}" in - progress) - if [ ! -e chroot/etc/apt/preferences.d/progress.pref ] + progress-linux) + if [ ! -e chroot/etc/apt/preferences.d/progress-linux.pref ] then _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" @@ -184,7 +184,7 @@ case "${1}" in for _DISTRIBUTION in ${_ENABLE_DISTRIBUTIONS} do -cat >> chroot/etc/apt/preferences.d/progress.pref << EOF +cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF Package: * Pin: release n=${_DISTRIBUTION} @@ -196,7 +196,7 @@ EOF for _DISTRIBUTION in ${_DISABLE_DISTRIBUTIONS} do -cat >> chroot/etc/apt/preferences.d/progress.pref << EOF +cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF #Package: * #Pin: release n=${_DISTRIBUTION} @@ -209,7 +209,7 @@ EOF case "${LB_DISTRIBUTION}" in artax-backports) -cat >> chroot/etc/apt/preferences.d/progress.tmp.pref << EOF +cat >> chroot/etc/apt/preferences.d/progress-linux.tmp.pref << EOF Package: squashfs-tools Pin: release n=squeeze Pin-Priority: 1001 @@ -323,7 +323,7 @@ EOF fi # Remove temporary hack to avoid squashfs version mismatch for artax-backports - rm -f chroot/etc/apt/preferences.d/progress.tmp.pref + rm -f chroot/etc/apt/preferences.d/progress-linux.tmp.pref # Removing stage file rm -f .build/chroot_apt diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index e4de5a209..502ff449f 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -94,7 +94,7 @@ EOF if [ "${LB_SECURITY}" = "true" ] then case "${LB_MODE}" in - debian|progress) + debian|progress-linux) case "${LB_PARENT_DISTRIBUTION}" in sid) @@ -110,7 +110,7 @@ EOF ;; esac - if [ "${LB_MODE}" = progress ] + if [ "${LB_MODE}" = progress-linux ] then echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list @@ -664,7 +664,7 @@ EOF if [ "${LB_SECURITY}" = "true" ] then case "${LB_MODE}" in - debian|progress) + debian|progress-linux) case "${LB_PARENT_DISTRIBUTION}" in sid) @@ -680,7 +680,7 @@ EOF ;; esac - if [ "${LB_MODE}" = progress ] + if [ "${LB_MODE}" = progress-linux ] then echo "deb ${LB_MIRROR_BINARY_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list diff --git a/scripts/build/source_disk b/scripts/build/source_disk index e51b74df3..380fdd599 100755 --- a/scripts/build/source_disk +++ b/scripts/build/source_disk @@ -72,7 +72,7 @@ case "${LB_MODE}" in TRACE="" ;; - progress) + progress-linux) TITLE="Progress Linux" STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}" TRACE="project/trace/archive-master.progress-linux.org" |