put back /usr/bin vs /usr/local/bin

ton-blockchain · Jan 30, 2024 · 505d8fb · 505d8fb
1 parent b6aea99
commit 505d8fb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/.github/workflows/create-deb-ppa-packages.yml b/.github/workflows/create-deb-ppa-packages.yml
@@ -27,10 +27,10 @@ jobs:
         run: |
           REPO_DIR=$PWD
           TAG=$(git ls-remote --tags https://github.com/ton-blockchain/ton/  | tail -1 | sed -n -e 's/^.*tags\///p')
-          TAG=$(echo $TAG | sed  s'/-/.100/')
+          TAG=$(echo $TAG | sed  s'/-/./')
           DATE=$(date -R)
           VERSION=${TAG:1}
-          REVISION=3
+
           echo "latest TAG = $TAG, VERSION=$VERSION, DATE=$DATE"
 
           cd packages/deb
@@ -65,19 +65,19 @@ jobs:
           cp -R ton-linux-deb-amd64/* both/amd64/
           cp -R ton-linux-deb-arm64/* both/arm64/
           
-          tar -czvf ton-${VERSION}.${REVISION}.tar.gz -C both .
-          ln -s ton-${VERSION}.${REVISION}.tar.gz ton_${VERSION}.${REVISION}.orig.tar.gz
+          tar -czvf ton-${VERSION}.tar.gz -C both .
+          ln -s ton-${VERSION}.tar.gz ton_${VERSION}.orig.tar.gz
 
-          mkdir ton-$VERSION.${REVISION}
+          mkdir ton-$VERSION
 
-          cd ton-$VERSION.${REVISION}
+          cd ton-$VERSION
 
           cp -R ../debian .
-          sed -i "s/REVISION/${VERSION}.${REVISION}/g" debian/changelog
-          sed -i "s/VERSION/${VERSION}.${REVISION}/g" debian/changelog
+          sed -i "s/REVISION/${VERSION}/g" debian/changelog
+          sed -i "s/VERSION/${VERSION}/g" debian/changelog
           sed -i "s/DATE/${DATE}/g" debian/changelog
      
           cat debian/{changelog,control}
 
           debuild -sa -S -kDA58A5F65D5236A0C8FD9A54AF03339AD20F1920
-          dput ppa:ton-foundation/ppa ../ton_${VERSION}.${REVISION}_source.changes
+          dput ppa:ton-foundation/ppa ../ton_${VERSION}_source.changes
diff --git a/packages/arch/PKGBUILD b/packages/arch/PKGBUILD
@@ -13,8 +13,8 @@ sha256sums=('SKIP')
 
 package() {
   cd "$srcdir"
-  mkdir -p ${pkgdir}/usr/local/{bin,lib/fift,share/ton}
-  cp -a bin/* ${pkgdir}/usr/local/bin/
-  cp -ar share/* ${pkgdir}/usr/local/share/
-  cp -ar lib/* ${pkgdir}/usr/local/lib/
+  mkdir -p ${pkgdir}/usr/{bin,lib/fift,share/ton}
+  cp -a bin/* ${pkgdir}/usr/bin/
+  cp -ar share/* ${pkgdir}/usr/share/
+  cp -ar lib/* ${pkgdir}/usr/lib/
 }
diff --git a/packages/deb/debian/install b/packages/deb/debian/install
@@ -1 +0,0 @@
-amd64/bin /usr/local

diff --git a/packages/deb/debian/rules b/packages/deb/debian/rules
@@ -11,9 +11,12 @@ override_dh_strip:
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -Sextreme -z9
 
+override_dh_install:
+	install -d debian/ton/usr
+	cp --reflink=auto -ar ./${DEB_BUILD_ARCH}/bin debian/ton/usr
+	cp --reflink=auto -ar ./${DEB_BUILD_ARCH}/lib debian/ton/usr
+	cp --reflink=auto -ar ./${DEB_BUILD_ARCH}/share debian/ton/usr
+
 override_dh_shlibdeps:
 	echo Skipping shlibdeps
 
-override_dh_usrlocal:
-	echo Skipping usr/local
-
diff --git a/packages/rpm.sh b/packages/rpm.sh
@@ -16,10 +16,10 @@ mkdir -p "$RPMBUILD_PATH"/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 tar --create --file "$RPMBUILD_PATH"/SOURCES/ton.tar.gz --transform 's,^,ton-dev/,' -C "$NIX_RESULT_PATH" .
 
 rpmbuild --define "_topdir $RPMBUILD_PATH" \
-         --define "_prefix /usr/local" \
-         --define "_bindir /usr/local/bin" \
-         --define "_libdir /usr/local/lib" \
-         --define "_datadir /usr/local/share" \
+         --define "_prefix /usr" \
+         --define "_bindir /usr/bin" \
+         --define "_libdir /usr/lib" \
+         --define "_datadir /usr/share" \
          --define "releasever $TON_RELEASE" \
          --target "$PACKAGE_ARCH" \
          -v -bb "$RPM_TEMPLATE_PATH"