Magellan Linux

Diff of /smage/branches/alx07x-stable/include/alx-split.sminc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4818 by niro, Tue May 7 13:01:42 2013 UTC revision 6981 by niro, Thu Jul 30 15:53:32 2015 UTC
# Line 72  alx-split_generate_split_info() Line 72  alx-split_generate_split_info()
72   {   {
73   DESCRIPTION=\"${DESCRIPTION}\"   DESCRIPTION=\"${DESCRIPTION}\"
74   DEPEND=\"${DEPEND}\"   DEPEND=\"${DEPEND}\"
75     if [[ ! -z \${ALX_DEPEND} ]]
76     then
77     DEPEND=\"\${DEPEND}
78     \${ALX_DEPEND}\"
79     fi
80   _PNAME=\"${PNAME}\"   _PNAME=\"${PNAME}\"
81   }"   }"
82  }  }
# Line 82  alx-split_generate_split_info_dev() Line 87  alx-split_generate_split_info_dev()
87   {   {
88   DESCRIPTION=\"Development files for ${PCAT}/${PNAME}-${PVER}-${PBUILD}.\"   DESCRIPTION=\"Development files for ${PCAT}/${PNAME}-${PVER}-${PBUILD}.\"
89   DEPEND=\"== ${PCAT}/${PNAME}-${PVER}\"   DEPEND=\"== ${PCAT}/${PNAME}-${PVER}\"
90     if [[ ! -z \${ALX_DEV_DEPEND} ]]
91     then
92     DEPEND=\"\${DEPEND}
93     \${ALX_DEV_DEPEND}\"
94     fi
95   _PNAME=\"${PNAME}\"   _PNAME=\"${PNAME}\"
96   }"   }"
97  }  }
98    
99    # honor multilib builds
100    if [[ ${MULTILIB_BUILD} = true ]]
101    then
102     if [[ ! -z $(typeset -f src_install) ]]
103     then
104     # rename the old one
105     old_alx_src_install=old_alx_$(typeset -f src_install)
106     eval "${old_alx_src_install}"
107    
108     alx_generic_src_install()
109     {
110     old_alx_src_install || die
111     }
112     fi
113    fi
114    
115  alx-split_generate_src_install_dev()  alx-split_generate_src_install_dev()
116  {  {
117   eval "alx-split_src_install_${PNAME}-dev()   eval "alx-split_src_install_${PNAME}-dev()
# Line 117  alx-split_generate_src_install_dev() Line 143  alx-split_generate_src_install_dev()
143   *\**|*\\\**)   *\**|*\\\**)
144   if [[ -e \${BINDIR}/\$(dirname \${i}) ]]   if [[ -e \${BINDIR}/\$(dirname \${i}) ]]
145   then   then
146     echo find \${BINDIR}/\$(dirname \${i}) -maxdepth 1 -name \"\$(basename \${i})\" | xargs --no-run-if-empty rm
147   find \${BINDIR}/\$(dirname \${i}) -maxdepth 1 -name \"\$(basename \${i})\" | xargs --no-run-if-empty rm   find \${BINDIR}/\$(dirname \${i}) -maxdepth 1 -name \"\$(basename \${i})\" | xargs --no-run-if-empty rm
148   fi   fi
149   ;;   ;;
150   *)   *)
151   if [[ -e \${BINDIR}/\${i} ]]   if [[ -e \${BINDIR}/\${i} ]]
152   then   then
153     echo rm -r \${BINDIR}/\${i}
154     rm -r \${BINDIR}/\${i} || die
155     # busybox does not detect symlinks with -e if the reference does not exists
156     elif [[ -L \${BINDIR}/\${i} ]]
157     then
158     echo rm -r \${BINDIR}/\${i}
159   rm -r \${BINDIR}/\${i} || die   rm -r \${BINDIR}/\${i} || die
160   fi   fi
161   ;;   ;;
# Line 168  alx-split_generate_src_install() Line 201  alx-split_generate_src_install()
201   *\**|*\\\**)   *\**|*\\\**)
202   if [[ -e \${BINDIR}/\$(dirname \${i}) ]]   if [[ -e \${BINDIR}/\$(dirname \${i}) ]]
203   then   then
204     echo find \${BINDIR}/\$(dirname \${i}) -maxdepth 1 -name \"\$(basename \${i})\" | xargs --no-run-if-empty rm
205   find \${BINDIR}/\$(dirname \${i}) -maxdepth 1 -name \"\$(basename \${i})\" | xargs --no-run-if-empty rm   find \${BINDIR}/\$(dirname \${i}) -maxdepth 1 -name \"\$(basename \${i})\" | xargs --no-run-if-empty rm
206   fi   fi
207   ;;   ;;
208   *)   *)
209   if [[ -e \${BINDIR}/\${i} ]]   if [[ -e \${BINDIR}/\${i} ]]
210   then   then
211     echo rm -r \${BINDIR}/\${i}
212     rm -r \${BINDIR}/\${i} || die
213     # busybox does not detect symlinks with -e if the reference does not exists
214     elif [[ -L \${BINDIR}/\${i} ]]
215     then
216     echo rm -r \${BINDIR}/\${i}
217   rm -r \${BINDIR}/\${i} || die   rm -r \${BINDIR}/\${i} || die
218   fi   fi
219   ;;   ;;

Legend:
Removed from v.4818  
changed lines
  Added in v.6981