diff --git a/exlibs/cdemu-common.exlib b/exlibs/cdemu-common.exlib index cf71e06..2bba5bc 100644 --- a/exlibs/cdemu-common.exlib +++ b/exlibs/cdemu-common.exlib @@ -35,7 +35,7 @@ src_prepare() { if [[ "${PV}" == scm ]] ; then if ${WANT_AUTOGEN} ; then - ./autogen.sh || die "autogen.sh failed" + edo ./autogen.sh fi fi } diff --git a/exlibs/djb.exlib b/exlibs/djb.exlib index 2f1d7b7..6b9c229 100644 --- a/exlibs/djb.exlib +++ b/exlibs/djb.exlib @@ -18,35 +18,35 @@ djb_src_prepare() { local basedir=$(dirname $(find -type f -name conf-cc)) local ranlib_file=$(grep -r ranlib . | sed 's/:.*//') - sed \ + edo sed \ -e "/^gcc/s:.*:& ${CPPFLAGS} ${CFLAGS}:" \ -e "/^gcc/s:gcc:${CC}:" \ - -i "${basedir}/conf-cc" || die "sed ${basedir}/conf-cc failed" + -i "${basedir}/conf-cc" - sed \ + edo sed \ -e "/^gcc/s:.*:& ${LDFLAGS}:" \ -e "/^gcc/s:gcc:${LD}:" \ - -i "${basedir}/conf-ld" || die "sed ${basedir}/conf-ld failed" + -i "${basedir}/conf-ld" - sed \ + edo sed \ -e "/echo 'ar cr/s:ar:${AR}:" \ -e "/*) echo 'ranlib \"\\$/s:ranlib:${RANLIB}:" \ - -i "${ranlib_file}" || die "sed ${ranlib_file} failed" + -i "${ranlib_file}" if [ -f "${basedir}/auto-str.c" ] ; then - cat >> "${basedir}/auto-str" <> "${basedir}/auto-str" <> "${basedir}/uint64.h" <> "${basedir}/uint64.h" < "${basedir}/conf-home" \ - || die "creating conf-home failed" + edo echo /usr > "${basedir}/conf-home" fi default diff --git a/packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0 b/packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0 index 23260da..f99e03f 100644 --- a/packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0 +++ b/packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0 @@ -24,8 +24,7 @@ src_unpack() { } src_compile() { - "${CC}" ${CFLAGS} ${LDFLAGS} -o "${SRC}.out" "${FETCHEDDIR}/${SRC}" \ - || die "compilation failed" + edo "${CC}" ${CFLAGS} ${LDFLAGS} -o "${SRC}.out" "${FETCHEDDIR}/${SRC}" } src_install() { diff --git a/packages/app-emulation/qemu/qemu.exlib b/packages/app-emulation/qemu/qemu.exlib index 12e7aba..94dd20f 100644 --- a/packages/app-emulation/qemu/qemu.exlib +++ b/packages/app-emulation/qemu/qemu.exlib @@ -64,7 +64,7 @@ qemu_src_configure () option curl || myconf+=( --disable-curl ) [[ -n "${audio_drv[@]}" ]] && myconf+=( --enable-mixemu ) - ./configure \ + edo ./configure \ --prefix=/usr \ --host-cc="${BUILD_CC}" \ --cc="${CC}" \ @@ -74,16 +74,14 @@ qemu_src_configure () --audio-drv-list="$(echo ${audio_drv[@]} | tr ' ' ',')" \ ${myconf[@]} \ ${EXTRA_ECONF} \ - $@ \ - || die "configure failed" + $@ } qemu_src_prepare () { - sed \ + edo sed \ -e '/^CFLAGS=/s:-O2 -g::' \ -e '/^LDFLAGS=/s:-g::' \ - -i configure \ - || die "sed configure failed"; + -i configure } diff --git a/packages/app-emulation/vhba-module/vhba-module.exlib b/packages/app-emulation/vhba-module/vhba-module.exlib index 1478b73..79d8f69 100644 --- a/packages/app-emulation/vhba-module/vhba-module.exlib +++ b/packages/app-emulation/vhba-module/vhba-module.exlib @@ -20,7 +20,7 @@ vhba-module_src_compile() { vhba-module_src_install() { dodir /usr/src - cp -pPR "${WORK}" "${IMAGE}/usr/src/${PNV}" + edo cp -pPR "${WORK}" "${IMAGE}/usr/src/${PNV}" insinto /etc/udev/rules.d hereins 90-vhba.rules <> config.default + edo echo "$1" >> config.default shift done } src_prepare() { - sed -e "s:TILECACHE:[Tt][Ii][Ll][Ee][Cc][Aa][Cc][Hh][Ee]:g" \ + edo sed -e "s:TILECACHE:[Tt][Ii][Ll][Ee][Cc][Aa][Cc][Hh][Ee]:g" \ -e '/^INSTALL_PROGRAM ?= /s: -s::' \ - -i Makefile || die "sed Makefile failed" + -i Makefile option debug && ja2_config _DEBUG=yes WITH_SOUND_DEBUG=yes option demo && ja2_config WITH_DEMO=yes option editor && ja2_config JA2EDITOR=yes diff --git a/packages/sys-apps/daemontools/daemontools-0.76.exheres-0 b/packages/sys-apps/daemontools/daemontools-0.76.exheres-0 index f3b7e1c..884e670 100644 --- a/packages/sys-apps/daemontools/daemontools-0.76.exheres-0 +++ b/packages/sys-apps/daemontools/daemontools-0.76.exheres-0 @@ -32,8 +32,8 @@ DEFAULT_SRC_PREPARE_PATCHES+=( DEFAULT_SRC_INSTALL_EXTRA_SUBDIRS+=( src ) src_compile() { - echo >src/rts.tests || "overwriting tests failed" - package/compile || die "compilation failed" + edo echo >src/rts.tests + edo package/compile } src_install() { diff --git a/packages/sys-apps/usbip/usbip.exlib b/packages/sys-apps/usbip/usbip.exlib index c45c934..8efdc47 100644 --- a/packages/sys-apps/usbip/usbip.exlib +++ b/packages/sys-apps/usbip/usbip.exlib @@ -31,16 +31,15 @@ DEFAULT_SRC_CONFIGURE_OPTION_WITHS+=( 'tcpd tcp-wrappers' ) WORK="${WORK}/src" src_prepare() { - sed \ + edo sed \ -e "/^AM_CFLAGS = /s:= := -DUSBIDS_FILE='\"@USBIDS_DIR@/usb.ids\"' :" \ - -i cmd/Makefile.am \ - || die "sed cmd/Makefile.am failed" + -i cmd/Makefile.am autotools_src_prepare } src_install() { default - rmdir "${IMAGE}/usr/share/usbip" + edo rmdir "${IMAGE}/usr/share/usbip" } diff --git a/packages/sys-fs/xfsprogs/xfsprogs-3.1.1.exheres-0 b/packages/sys-fs/xfsprogs/xfsprogs-3.1.1.exheres-0 index ece30b9..058f04c 100644 --- a/packages/sys-fs/xfsprogs/xfsprogs-3.1.1.exheres-0 +++ b/packages/sys-fs/xfsprogs/xfsprogs-3.1.1.exheres-0 @@ -21,11 +21,11 @@ DEFAULT_SRC_INSTALL_PARAMS+=( DIST_ROOT="$IMAGE" ) src_prepare() { default - sed -e "/^PKG_DOC_DIR\t=/s:@pkg_name@:$PNV:" -i include/builddefs.in || die "sed failed" + edo sed -e "/^PKG_DOC_DIR\t=/s:@pkg_name@:$PNV:" -i include/builddefs.in } src_install() { default - rm "$IMAGE/usr/share/doc/$PNV/release.sh" || die "failed to remove release.sh" + edo rm "$IMAGE/usr/share/doc/$PNV/release.sh" }