diff options
| author |   Tomas Chvatal <tchvatal@suse.cz> | 2011-08-12 15:28:47 +0200 |
|---|---|---|
| committer | Tomas Chvatal <tchvatal@suse.cz> | 2011-08-12 15:28:47 +0200 |
| commit | d975dab227e3ba52acdab9924c8c802c731a3317 (patch) | |
| tree | 49c540bf96557dbe1542b530d1995bf07e91517b | |
| parent | Update a lot the src_install magic to be nicer. (diff) | |
| download | scarabeus-d975dab227e3ba52acdab9924c8c802c731a3317.tar.gz scarabeus-d975dab227e3ba52acdab9924c8c802c731a3317.tar.bz2 scarabeus-d975dab227e3ba52acdab9924c8c802c731a3317.zip | |
Punt useless code and die with better msg.
| -rw-r--r-- | sys-boot/grub/Manifest | 4 | ||||
| -rw-r--r-- | sys-boot/grub/grub-1.99.ebuild | 26 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 26 |
3 files changed, 6 insertions, 50 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 7f610ce..612ad8c 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,5 +1,5 @@ AUX grub.default 1130 RMD160 6df056d7bcbaf75783921c5c45bcf3544d284f58 SHA1 c62cb61c4d96ca9780ea559d1d38fce91197c701 SHA256 8e2cc8c02135a13d4401971ce9955039cc0dc7ceb045e3eff8ba673fceef6bb9 DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b -EBUILD grub-1.99.ebuild 7267 RMD160 57fed8e4ebc094fa4b8b8604643523d8fc60425b SHA1 0aa4decbf894e4dd187c4684e4bccdbdd1c18cda SHA256 45c0adeb9b249716e0aed753c96768113759701da3d7ebd8b25758538ffa0dd9 -EBUILD grub-9999.ebuild 7267 RMD160 8e772a74a69033f00abb4a6827105117a2aeb248 SHA1 5bedf054f5ec99212020caa5c3a8e272fd202061 SHA256 861b2c580849eb8aa5153b002dc7106ff92c2cdc204d1a31e92c5324ca94eb7a +EBUILD grub-1.99.ebuild 6731 RMD160 7fab87fdc6fad34d3d8769233a50480023fe71ec SHA1 b038308415c7badd3156234f322a5d037cbf72ce SHA256 41dfecbd2f27f1b551a55217691262591ed071cd3bbf06960fdf0a6c0a0113e6 +EBUILD grub-9999.ebuild 6731 RMD160 bc7a597c5f439898b6a502471117f3d3b3baa53b SHA1 299a502248b8115e154932f96fa1bcf6bf95e5c9 SHA256 883b3446c17c9210ec6a84a8c0982d1fd92b8c173cedc2b3bb77b4a9ae1be55b MISC metadata.xml 264 RMD160 3cb995676f964b9637fbfc0027a81b9409802608 SHA1 c4d35e3a71c545cdf1aae525de803126bf54f596 SHA256 9bd1ce830cf1b821978ab90c81b2e369177a8d7c1bfe2dd2868419872c097f64 diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild index b682bf6..d963f96 100644 --- a/sys-boot/grub/grub-1.99.ebuild +++ b/sys-boot/grub/grub-1.99.ebuild @@ -84,8 +84,7 @@ QA_EXECSTACK=" grub_run_phase() { local phase=$1 local platform=$2 - [[ -z ${phase} ]] && die "${FUNCNAME}: Phase is undefined" - [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined" + [[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]" [[ -d "${WORKDIR}/build-${platform}" ]] || \ { mkdir "${WORKDIR}/build-${platform}" || die ; } @@ -99,32 +98,11 @@ grub_run_phase() { popd > /dev/null || die } -grub_rename_files() { - # specifies if we do sed work too - local deep=$1 - [[ ${deep} == deep ]] && shift || deep="" - local path=$@ - - [[ -z ${path} ]] && die "${FUNCNAME}: Path is undefined" - - pushd "${path}" > /dev/null - for i in grub*; do - echo ">>> Slotting \"${path}/${i}\" to \"${path}/${i/grub/grub2}\"" - if [[ -n $deep ]]; then - sed -i \ - -e 's:\([[:space:]]\+\)grub-:\1grub2-:g' \ - ${i} || die - fi - mv ${i} ${i/grub/grub2} || die - done - popd > /dev/null -} - grub_src_configure() { local platform=$1 local target - [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined" + [[ -z ${platform} ]] && die "${FUNCNAME} [platform]" # if we have no platform then --with-platform=guessed does not work [[ ${platform} == "guessed" ]] && platform="" diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 00eb143..a16f2a7 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -84,8 +84,7 @@ QA_EXECSTACK=" grub_run_phase() { local phase=$1 local platform=$2 - [[ -z ${phase} ]] && die "${FUNCNAME}: Phase is undefined" - [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined" + [[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]" [[ -d "${WORKDIR}/build-${platform}" ]] || \ { mkdir "${WORKDIR}/build-${platform}" || die ; } @@ -99,32 +98,11 @@ grub_run_phase() { popd > /dev/null || die } -grub_rename_files() { - # specifies if we do sed work too - local deep=$1 - [[ ${deep} == deep ]] && shift || deep="" - local path=$@ - - [[ -z ${path} ]] && die "${FUNCNAME}: Path is undefined" - - pushd "${path}" > /dev/null - for i in grub*; do - echo ">>> Slotting \"${path}/${i}\" to \"${path}/${i/grub/grub2}\"" - if [[ -n $deep ]]; then - sed -i \ - -e 's:\([[:space:]]\+\)grub-:\1grub2-:g' \ - ${i} || die - fi - mv ${i} ${i/grub/grub2} || die - done - popd > /dev/null -} - grub_src_configure() { local platform=$1 local target - [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined" + [[ -z ${platform} ]] && die "${FUNCNAME} [platform]" # if we have no platform then --with-platform=guessed does not work [[ ${platform} == "guessed" ]] && platform="" |