Annotation of /trunk/mage/patches/mage-0.4.29-unpack-pkgs-while-installation.patch
Parent Directory
| 
Revision Log
Revision 2680 -
(hide annotations)
(download)
Tue Jul 28 10:05:04 2015 UTC (8 years, 10 months ago) by niro
File size: 3719 byte(s)
Tue Jul 28 10:05:04 2015 UTC (8 years, 10 months ago) by niro
File size: 3719 byte(s)
-backport of the mage unpack while installation patch
| 1 | niro | 2680 | ------------------------------------------------------------------------ |
| 2 | r2156 | niro | 2013-08-14 09:25:43 +0200 (Mi, 14. Aug 2013) | 1 Zeile | ||
| 3 | |||
| 4 | -introduce unpack_package() function to unpack single packages and do unpack of a package while installing phase and not all packages at once to save space | ||
| 5 | |||
| 6 | Index: usr/lib/mage/mage4.sh | ||
| 7 | =================================================================== | ||
| 8 | --- usr/lib/mage/mage4.sh (Revision 2155) | ||
| 9 | +++ usr/lib/mage/mage4.sh (Revision 2156) | ||
| 10 | @@ -262,7 +262,6 @@ | ||
| 11 | # first fetch all packages | ||
| 12 | fetch_packages ${ALLDEPS} || die "fetching packages" | ||
| 13 | md5sum_packages ${ALLDEPS} || die "md5 sum packages" | ||
| 14 | - unpack_packages ${ALLDEPS} || die "unpacking packages" | ||
| 15 | install_packages ${ALLDEPS} || die "installing packages" | ||
| 16 | ;; | ||
| 17 | |||
| 18 | @@ -341,7 +340,6 @@ | ||
| 19 | # first fetch all packages | ||
| 20 | fetch_packages ${ALLDEPS} || die "fetching packages" | ||
| 21 | md5sum_packages ${ALLDEPS} || die "md5 sum packages" | ||
| 22 | - unpack_packages ${ALLDEPS} || die "unpacking packages" | ||
| 23 | install_packages ${ALLDEPS} || die "installing packages" | ||
| 24 | ;; | ||
| 25 | |||
| 26 | Index: usr/lib/mage/mage4.functions.sh | ||
| 27 | =================================================================== | ||
| 28 | --- usr/lib/mage/mage4.functions.sh (Revision 2155) | ||
| 29 | +++ usr/lib/mage/mage4.functions.sh (Revision 2156) | ||
| 30 | @@ -102,12 +102,50 @@ | ||
| 31 | return ${retval} | ||
| 32 | } | ||
| 33 | |||
| 34 | +unpack_package() | ||
| 35 | +{ | ||
| 36 | + local magefile="$1" | ||
| 37 | + local pkg | ||
| 38 | + local pkgtype | ||
| 39 | + local tar_opts | ||
| 40 | + | ||
| 41 | + pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}" | ||
| 42 | + pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})" | ||
| 43 | + | ||
| 44 | + xtitle "[ Unpacking ${pkg} ]" | ||
| 45 | + | ||
| 46 | + # abort on virtual pkg | ||
| 47 | + if [[ ${pkgtype} = virtual ]] | ||
| 48 | + then | ||
| 49 | + echo -ne " ${COLBLUE}---${COLDEFAULT}" | ||
| 50 | + echo " !unpack virtual ${pkg/.${PKGSUFFIX}/} ... " | ||
| 51 | + continue | ||
| 52 | + fi | ||
| 53 | + | ||
| 54 | + # abort on sources pkg | ||
| 55 | + if [[ ${pkgtype} = sources ]] | ||
| 56 | + then | ||
| 57 | + echo -ne " ${COLBLUE}---${COLDEFAULT}" | ||
| 58 | + echo " !unpack sources ${pkg/.${PKGSUFFIX}/} ... " | ||
| 59 | + continue | ||
| 60 | + fi | ||
| 61 | + | ||
| 62 | + # busybox? | ||
| 63 | + if need_busybox_support tar | ||
| 64 | + then | ||
| 65 | + tar_opts="xjf" | ||
| 66 | + else | ||
| 67 | + tar_opts="xjmf" | ||
| 68 | + fi | ||
| 69 | + | ||
| 70 | + echo -e " ${COLBLUE}***${COLDEFAULT} unpacking ${pkg} ... " | ||
| 71 | + tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}" | ||
| 72 | +} | ||
| 73 | + | ||
| 74 | unpack_packages() | ||
| 75 | { | ||
| 76 | local list="$@" | ||
| 77 | local magefile | ||
| 78 | - local pkg | ||
| 79 | - local pkgtype | ||
| 80 | local count_current | ||
| 81 | local count_total | ||
| 82 | local tar_opts | ||
| 83 | @@ -120,38 +158,8 @@ | ||
| 84 | |||
| 85 | for magefile in ${list} | ||
| 86 | do | ||
| 87 | - pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}" | ||
| 88 | - pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})" | ||
| 89 | - | ||
| 90 | + unpack_package "${magefile}" | ||
| 91 | (( count_current++ )) | ||
| 92 | - xtitle "[ (${count_current}/${count_total}) Unpacking ${pkg} ]" | ||
| 93 | - | ||
| 94 | - # abort on virtual pkg | ||
| 95 | - if [[ ${pkgtype} = virtual ]] | ||
| 96 | - then | ||
| 97 | - echo -ne " ${COLBLUE}---${COLDEFAULT}" | ||
| 98 | - echo " !unpack virtual (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... " | ||
| 99 | - continue | ||
| 100 | - fi | ||
| 101 | - | ||
| 102 | - # abort on sources pkg | ||
| 103 | - if [[ ${pkgtype} = sources ]] | ||
| 104 | - then | ||
| 105 | - echo -ne " ${COLBLUE}---${COLDEFAULT}" | ||
| 106 | - echo " !unpack sources (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... " | ||
| 107 | - continue | ||
| 108 | - fi | ||
| 109 | - | ||
| 110 | - # busybox? | ||
| 111 | - if need_busybox_support tar | ||
| 112 | - then | ||
| 113 | - tar_opts="xjf" | ||
| 114 | - else | ||
| 115 | - tar_opts="xjmf" | ||
| 116 | - fi | ||
| 117 | - | ||
| 118 | - echo -e " ${COLBLUE}***${COLDEFAULT} unpacking (${count_current}/${count_total}): ${pkg} ... " | ||
| 119 | - tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}" | ||
| 120 | done | ||
| 121 | |||
| 122 | # add a crlf for a better view | ||
| 123 | @@ -2689,6 +2697,7 @@ | ||
| 124 | if [[ ${PKGTYPE} != virtual ]] && \ | ||
| 125 | [[ ${PKGTYPE} != sources ]] | ||
| 126 | then | ||
| 127 | + unpack_package "${magefile}" | ||
| 128 | echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... " | ||
| 129 | build_doinstall ${PKGNAME} | ||
| 130 | fi | ||
| 131 | |||
| 132 | ------------------------------------------------------------------------ |