Differences

This shows you the differences between two versions of the page.

--- wiki:debian_packaging [2018/06/26 20:59] – neyron
+++ wiki:debian_packaging [2021/06/29 10:24] (current) – [Sync the files back from the oar-ftp machine] snoir
@@ Line 87: / Line 87: @@
 <code bash>
 $ cd ..
-$ export OAR_DIR=$PWD OAR_FTP=oar-ftp.lig
+# Set environment variables: OAR_DIR should be a relative path to your home. OAR_FTP can include a username if not the same on oar-ftp.
+$ export OAR_DIR=${PWD#$HOME/} OAR_FTP=oar-ftp.lig
+# First create the remote OAR_DIR directory (e.g. ~/scm/OAR) if it does not already exist
+$ ssh $OAR_FTP mkdir -p $OAR_DIR
+# Send files
 $ rsync -avz --delete build-area tarballs $OAR_FTP:$OAR_DIR
 </code>
@@ Line 96: / Line 100: @@
 <code bash>
-$ export OAR_VERSION=$(head -n1 oar/debian/changelog |sed -e 's/^.\+(\(.\+\)).\+$/\1/') && echo $OAR_VERSION
+$ export OAR_VERSION=$(head -n1 oar/debian/changelog |sed -e 's/^.\+(\(.\+\)).\+$/\1/') && echo "export OAR_VERSION=$OAR_VERSION"
-$ export OAR_CHROOT=$(head -n1 oar/debian/changelog |sed -e 's/^.\+)\s\+\([^\;]\+\);.\+$/\1/') && echo $OAR_CHROOT
+$ export OAR_CHROOT=$(head -n1 oar/debian/changelog |sed -e 's/^.\+)\s\+\([^\;]\+\);.\+$/\1/') && echo "export OAR_CHROOT=$OAR_CHROOT"
+$ export OAR_SHORT_VERSION=$(echo $OAR_VERSION | sed -re 's/(.*)\-(.+)/\1/g') && echo "export OAR_SHORT_VERSION=$OAR_SHORT_VERSION"
 # oar-ftp sshd accepts env variables OAR_*
-$ ssh $OAR_FTP -o SendEnv=OAR_VERSION -o SendEnv=OAR_DIR -o SendEnv=OAR_CHROOT
+$ ssh $OAR_FTP -o SendEnv=OAR_VERSION -o SendEnv=OAR_DIR -o SendEnv=OAR_CHROOT -o SendEnv=OAR_SHORT_VERSION
+# First update the build chroots
 oar-ftp$ sudo sbuild-update source:$OAR_CHROOT && sudo sbuild-update --upgrade source:$OAR_CHROOT
+# Other arch? arm64 and ppc64el:
+oar-ftp$ sudo sbuild-update source:$OAR_CHROOT --arch arm64 && sudo sbuild-update --upgrade source:$OAR_CHROOT --arch arm64
+oar-ftp$ sudo sbuild-update source:$OAR_CHROOT --arch ppc64el && sudo sbuild-update --upgrade source:$OAR_CHROOT --arch ppc64el
+# Then build:
 oar-ftp$ cd $OAR_DIR/build-area
+# In some cases (if user on local machine is not the same as the oar-ftp VM), link need to be fixed
+oar-ftp$ rm oar_$OAR_SHORT_VERSION.orig.tar.gz
+oar-ftp$ ln -s $OAR_DIR/tarballs/oar_$OAR_SHORT_VERSION.orig.tar.gz oar_$OAR_SHORT_VERSION.orig.tar.gz
+# amd64 and sources packages:
 oar-ftp$ sbuild -As -d $OAR_CHROOT --arch amd64 --debbuildopts "-uc -us" oar_$OAR_VERSION.dsc
-# if multi-arch: sbuild -d $OAR_CHROOT --arch $OTHER_ARCH --debbuildopts "-uc -us" oar_$OAR_VERSION.dsc
+# Other arch ? arm64 and ppc64el binary packages:
+oar-ftp$ sbuild -A -d $OAR_CHROOT --arch arm64 --debbuildopts "-uc -us" oar_$OAR_VERSION.dsc
+oar-ftp$ sbuild -A -d $OAR_CHROOT --arch ppc64el --debbuildopts "-uc -us" oar_$OAR_VERSION.dsc
 oar-ftp$ logout
 </code>
@@ Line 110: / Line 126: @@
 <code bash>
 $ rsync -avz $OAR_FTP:$OAR_DIR/{build-area,tarballs} .
+# require in some cases, as on oar-ftp
+$ rm build-area/oar_${OAR_SHORT_VERSION}.orig.tar.gz
+$ ln -s ../tarballs/oar_${OAR_SHORT_VERSION}.orig.tar.gz build-area/oar_${OAR_SHORT_VERSION}.orig.tar.gz
 </code>
@@ Line 118: / Line 137: @@
 <code bash>
-# if multi-arch: mergechanges -f oar_${OAR_VERSION}_*.changes; then replace amd64 by multi, below.
 # update lintian
 $ sudo apt-get update && sudo apt-get install -t sid lintian
@@ Line 124: / Line 142: @@
 $ lintian --pedantic -I -i oar_${OAR_VERSION}_amd64.changes
 $ debsign oar_${OAR_VERSION}_amd64.changes
+# or for multi-arch:
+$ mergechanges -f oar_${OAR_VERSION}_*.changes
+$ debsign oar_${OAR_VERSION}_multi.changes
 </code>
@@ Line 144: / Line 165: @@
 <code bash>
 $ cd ../build-area && dput oar_${OAR_VERSION}_amd64.changes
+# Or if multi-arch:
+$ cd ../build-area && dput oar_${OAR_VERSION}_multi.changes
 </code>