Magellan Linux

Diff of /trunk/pkgtools/add2svn.sh

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

revision 821 by niro, Fri Apr 24 19:17:49 2009 UTC revision 1331 by niro, Tue May 31 17:44:01 2011 UTC
# Line 16  then Line 16  then
16  fi  fi
17    
18  #CURARCH=i686  #CURARCH=i686
19  CURARCH=x86_64  #CURARCH=x86_64
20    
21  BUILDROOT=/mnt/BUILDROOT-${CURARCH}-svn  if [[ -z ${CURARCH} ]]
22    then
23     echo "Environment variable \${CURARCH} not given. Aborted."
24     exit 1
25    fi
26    
27    BUILDROOT=/mnt/BUILDROOT-"${CURARCH}"-svn
28    
29  SMAGEDIR=$(dirname ${SMAGEFILE})  SMAGEDIR=$(dirname ${SMAGEFILE})
30  MD5DIR=${SMAGEDIR}/md5  MD5DIR=${SMAGEDIR}/md5
# Line 50  get_value_from_file() Line 56  get_value_from_file()
56   echo "${value}"   echo "${value}"
57  }  }
58    
59    get_function_from_file()
60    {
61     local function="$1"
62     local file="$2"
63    
64     # source /etc/mage.rc to get the includes right
65     source /etc/mage.rc.global
66     source /etc/mage.rc
67    
68     # evaluate the value
69     source ${file} $> /dev/null
70     export -f ${function}
71    }
72    
73  CURPCATEGORIE=$(get_value_from_file PCATEGORIE ${SMAGEFILE})  CURPCATEGORIE=$(get_value_from_file PCATEGORIE ${SMAGEFILE})
74  INSTALLDB_BUILDROOT=$(get_value_from_file INSTALLDB ${BUILDROOT}/etc/mage.rc)  INSTALLDB_BUILDROOT=$(get_value_from_file INSTALLDB ${BUILDROOT}/etc/mage.rc)
75    CURSPLITPACKAGES="$(get_value_from_file SPLIT_PACKAGES ${SMAGEFILE})"
76    
77  if [[ -d ${BUILDROOT}/${INSTALLDB_BUILDROOT}/${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD} ]]  if [[ -z ${CURSPLITPACKAGES} ]]
78  then  then
79   echo "Package '${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD}' already installed in ${BUILDROOT}. Aborting!"   if [[ -d ${BUILDROOT}/${INSTALLDB_BUILDROOT}/${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD} ]]
80   exit 1   then
81     echo "Package '${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD}' already installed in ${BUILDROOT}. Aborting!"
82     exit 1
83     fi
84    else
85     for i in ${CURSPLITPACKAGES}
86     do
87     if [[ -d ${BUILDROOT}/${INSTALLDB_BUILDROOT}/${CURPCATEGORIE}/${i}-${CURPVER}-${CURPBUILD} ]]
88     then
89     SPLITINSTALLED+=" ${CURPCATEGORIE}/${i}-${CURPVER}-${CURPBUILD}"
90     fi
91     done
92     if [[ ! -z ${SPLITINSTALLED} ]]
93     then
94     echo "Following SPLIT-Packages are installled from ${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD} in ${BUILDROOT}:"
95     for i in ${SPLITINSTALLED}
96     do
97     echo "     ${i}"
98     done
99     echo "Aborted."
100     exit 1
101     fi
102  fi  fi
103    
104  # delete md5 if exist  # delete md5 if exist
# Line 73  then Line 115  then
115   svn add ${SMAGENAME} md5/${MD5NAME}   svn add ${SMAGENAME} md5/${MD5NAME}
116    
117   [[ -z ${SVN_COMMIT} ]] && SVN_COMMIT="auto added: ver bump to ${CURPVER}-${CURPBUILD}"   [[ -z ${SVN_COMMIT} ]] && SVN_COMMIT="auto added: ver bump to ${CURPVER}-${CURPBUILD}"
118   svn commit -m "${SVN_COMMIT}" ${SMAGENAME} md5/${MD5NAME}   svn commit -m "${SVN_COMMIT}" ../${CURPNAME} ${SMAGENAME} md5 md5/${MD5NAME}
119   popd   popd
120  fi  fi
121    
# Line 81  sudo -s << EOF Line 123  sudo -s << EOF
123  :> ${BUILDROOT}/.installrc  :> ${BUILDROOT}/.installrc
124    
125  echo "export LC_ALL=C" >> ${BUILDROOT}/.installrc  echo "export LC_ALL=C" >> ${BUILDROOT}/.installrc
126    # do not start any services, set mage bootstrap flag
127    echo "export MAGE_BOOTSTRAP=true" >> ${BUILDROOT}/.installrc
128  echo "REPO=${REPO}" >> ${BUILDROOT}/.installrc  echo "REPO=${REPO}" >> ${BUILDROOT}/.installrc
129  echo "CURPNAME=${CURPNAME}" >> ${BUILDROOT}/.installrc  echo "CURPNAME=${CURPNAME}" >> ${BUILDROOT}/.installrc
130  echo "CURPVER=${CURPVER}" >> ${BUILDROOT}/.installrc  echo "CURPVER=${CURPVER}" >> ${BUILDROOT}/.installrc
131  echo "CURPBUILD=${CURPBUILD}" >> ${BUILDROOT}/.installrc  echo "CURPBUILD=${CURPBUILD}" >> ${BUILDROOT}/.installrc
132  echo "CURARCH=${CURARCH}" >> ${BUILDROOT}/.installrc  echo "CURARCH=${CURARCH}" >> ${BUILDROOT}/.installrc
133    echo "CURSPLITPACKAGES=\"${CURSPLITPACKAGES}\"" >> ${BUILDROOT}/.installrc
134  echo "SMAGENAME=${SMAGENAME}" >> ${BUILDROOT}/.installrc  echo "SMAGENAME=${SMAGENAME}" >> ${BUILDROOT}/.installrc
135  echo "MD5NAME=${MD5NAME}" >> ${BUILDROOT}/.installrc  echo "MD5NAME=${MD5NAME}" >> ${BUILDROOT}/.installrc
136  echo "PKGNAME=${PKGNAME}" >> ${BUILDROOT}/.installrc  echo "PKGNAME=${PKGNAME}" >> ${BUILDROOT}/.installrc
# Line 109  echo 'else'  >> ${BUILDROOT}/.installrc Line 154  echo 'else'  >> ${BUILDROOT}/.installrc
154   echo '[[ -f \${SRCTARBALL} ]] && rm \${SRCTARBALL}' >> ${BUILDROOT}/.installrc   echo '[[ -f \${SRCTARBALL} ]] && rm \${SRCTARBALL}' >> ${BUILDROOT}/.installrc
155   echo 'popd > /dev/null' >> ${BUILDROOT}/.installrc   echo 'popd > /dev/null' >> ${BUILDROOT}/.installrc
156  echo 'fi' >> ${BUILDROOT}/.installrc  echo 'fi' >> ${BUILDROOT}/.installrc
157  echo '/sbin/mage install ${CURPNAME} || exit 1' >> ${BUILDROOT}/.installrc  echo 'if [[ ! -z \${CURSPLITPACKAGES} ]]' >> ${BUILDROOT}/.installrc
158  echo 'mv /var/cache/mage/packages/${PKGNAME} /BUILDED' >> ${BUILDROOT}/.installrc  echo 'then' >> ${BUILDROOT}/.installrc
159     echo 'for package in \${CURSPLITPACKAGES}' >> ${BUILDROOT}/.installrc
160     echo 'do' >> ${BUILDROOT}/.installrc
161     echo '/sbin/mage install \${package} || exit 1' >> ${BUILDROOT}/.installrc
162     echo 'mv /var/cache/mage/packages/\${package}-${CURPVER}-${CURARCH}-${CURPBUILD}.mpk /BUILDED' >> ${BUILDROOT}/.installrc
163     echo 'done' >> ${BUILDROOT}/.installrc
164    echo 'else' >> ${BUILDROOT}/.installrc
165     echo '/sbin/mage install ${CURPNAME} || exit 1' >> ${BUILDROOT}/.installrc
166     echo 'mv /var/cache/mage/packages/${PKGNAME} /BUILDED' >> ${BUILDROOT}/.installrc
167    echo 'fi' >> ${BUILDROOT}/.installrc
168  echo 'mv /var/cache/mage/packages/sources/${SRCPKGNAME} /BUILDED/sources' >> ${BUILDROOT}/.installrc  echo 'mv /var/cache/mage/packages/sources/${SRCPKGNAME} /BUILDED/sources' >> ${BUILDROOT}/.installrc
169  echo 'rm -rf /var/cache/mage/sources/${CURPNAME}' >> ${BUILDROOT}/.installrc  echo 'rm -rf /var/cache/mage/sources/${CURPNAME}' >> ${BUILDROOT}/.installrc
170  EOF  EOF
# Line 118  EOF Line 172  EOF
172  sudo -H /sbin/chroot ${BUILDROOT} /bin/bash /.installrc  sudo -H /sbin/chroot ${BUILDROOT} /bin/bash /.installrc
173  sudo rm ${BUILDROOT}/.installrc  sudo rm ${BUILDROOT}/.installrc
174    
175  if [[ -f ${BUILDROOT}/BUILDED/${PKGNAME} ]]  if [[ ! -z ${CURSPLITPACKAGES} ]]
176  then  then
177   scp ${BUILDROOT}/BUILDED/${PKGNAME} ${SSHLOGIN}/${CURARCH}/   for package in ${CURSPLITPACKAGES}
178     do
179     # get pkgtyp
180     get_function_from_file split_info_${package} ${SMAGEFILE}
181     split_info_${package}
182     if [[ ${PKGTYPE} = virtual ]]
183     then
184     unset PKGTYPE
185     continue
186     fi
187     if [[ ${NOPKGBUILD} = true ]]
188     then
189     unset NOPKGBUILD
190     continue
191     fi
192    
193     pkgname="${package}-${CURPVER}-${CURARCH}-${CURPBUILD}.mpk"
194    
195     if [[ -f ${BUILDROOT}/BUILDED/${pkgname} ]]
196     then
197     scp ${BUILDROOT}/BUILDED/${pkgname} ${SSHLOGIN}/${CURARCH}/
198     else
199     echo "Error: ${BUILDROOT}/BUILDED/${pkgname} missing!"
200     exit 1
201     fi
202     done
203  else  else
204   echo "Error: ${BUILDROOT}/BUILDED/${PKGNAME} missing!"   if [[ -f ${BUILDROOT}/BUILDED/${PKGNAME} ]]
205   exit 1   then
206     scp ${BUILDROOT}/BUILDED/${PKGNAME} ${SSHLOGIN}/${CURARCH}/
207     else
208     echo "Error: ${BUILDROOT}/BUILDED/${PKGNAME} missing!"
209     exit 1
210     fi
211  fi  fi
212    
213  if [[ -f ${BUILDROOT}/BUILDED/sources/${SRCPKGNAME} ]]  if [[ -f ${BUILDROOT}/BUILDED/sources/${SRCPKGNAME} ]]
# Line 131  then Line 215  then
215   scp ${BUILDROOT}/BUILDED/sources/${SRCPKGNAME} ${SSHLOGIN}/src/   scp ${BUILDROOT}/BUILDED/sources/${SRCPKGNAME} ${SSHLOGIN}/src/
216  else  else
217   echo "Error: ${BUILDROOT}/BUILDED/${SRCPKGNAME} missing!"   echo "Error: ${BUILDROOT}/BUILDED/${SRCPKGNAME} missing!"
218   exit 1  # exit 1
219  fi  fi
220    
221  [[ -d /var/cache/mage/sources/${CURPNAME} ]] && rm -rf /var/cache/mage/sources/${CURPNAME}  [[ -d /var/cache/mage/sources/${CURPNAME} ]] && rm -rf /var/cache/mage/sources/${CURPNAME}
222    
223    
224    # if we don't break before; all things are right - regardless if $? is not zero
225    # because some things like src-pkg creation may be disabled
226    exit 0
227    

Legend:
Removed from v.821  
changed lines
  Added in v.1331