mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-09 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

sbopkg: Use correct SlackBuild file name to build package

Browse Source 
During package creation, most SlackBuilds copy the .SlackBuild file to
/usr/doc/$PKG/.  Previously, sbopkg would cause the "original"
SlackBuild instead of the "local" SlackBuild with user edits to be
copied to the documentation directory.  Now, sbopkg backs up the
original SlackBuild to $PKGNAME.SlackBuild.original before building the
package.

Old behavior:
1. Original (upstream) SlackBuild is named $PKGNAME.SlackBuild.
2. User optionally defines custom SlackBuild in
   $PKGNAME.SlackBuild.sbopkg.
3. sbopkg asks user to use Original or Local SlackBuild, and copies
   $PKGNAME.SlackBuild or $PKGNAME.SlackBuild.sbopkg to
   $PKGNAME.SlackBuild.build, respectively.
4. sbopkg builds package (which includes copying SlackBuild to
   /usr/doc/).
5. sbopkg removes *.build files.

New behavior:
1. Original (upstream) SlackBuild is named $PKGNAME.SlackBuild.
2. User optionally defines custom SlackBuild in
   $PKGNAME.SlackBuild.sbopkg.
3. sbopkg asks user to use Original or Local SlackBuild, and copies
   $PKGNAME.SlackBuild or $PKGNAME.SlackBuild.sbopkg to
   $PKGNAME.SlackBuild.build, respectively.
4. sbopkg backs up original SlackBuild by moving $PKGNAME.SlackBuild
   to $PKGNAME.SlackBuild.original.
5. sbopkg copies $PKGNAME.SlackBuild.build to $PKGNAME.SlackBuild.
6. sbopkg builds package (which includes copying SlackBuild to
   /usr/doc/).
7. sbopkg restores original SlackBuild by moving
   $PKGNAME.SlackBuild.original to $PKGNAME.SlackBuild.
8. sbopkg removes *.build files.

Signed-off-by: Willy Sudiarto Raharjo <willysr@sbopkg.org>
This commit is contained in:
Erich Ritz 2018-01-10 11:59:03 -07:00 committed by Willy Sudiarto Raharjo
parent bef8ffc58b
commit 371284cd89
No known key found for this signature in database
GPG Key ID: 887B8374D7333381
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/usr/doc/THANKS
View File

@ -90,3 +90,5 @@ We moved to github, so revision number no longer used
Sergey V.
Marcel Saegebarth
Loki Harfagr
Alan
Erich Ritz

7
src/usr/sbin/sbopkg
View File

@ -3412,6 +3412,8 @@ process_package() {
mkdir -p $SB_OUTPUT
cd $REPO_DIR/$PKGPATH
mv $PKGNAME.SlackBuild $PKGNAME.SlackBuild.original
cp $PKGNAME.SlackBuild.build $PKGNAME.SlackBuild
# Start the actual build
# We loop here to enable a 'retry' if anything goes wrong with the build
@ -3475,6 +3477,7 @@ process_package() {
# Cleanup
cd $REPO_DIR/$PKGPATH
mv $PKGNAME.SlackBuild.original $PKGNAME.SlackBuild
rm -f $PKGNAME.{info,SlackBuild}.build
rm -f options.build
@ -3499,10 +3502,10 @@ build_package() {
# deleting too much or leaving garbage behind us), a nice
# approach is to use sbopkg's own temp directory.
export TMP=$SBOPKGTMP
nice -n ${NICE:-10} sh $PKGNAME.SlackBuild.build
nice -n ${NICE:-10} sh $PKGNAME.SlackBuild
echo "Cleaning up..."
else
nice -n ${NICE:-10} sh $PKGNAME.SlackBuild.build
nice -n ${NICE:-10} sh $PKGNAME.SlackBuild
fi
)
}

4
tools/ChangeLog-latest.txt
View File

@ -1,6 +1,6 @@
SBOPKG NEWS
sbopkg-dev (2018-01-08 23:08:43 UTC)
sbopkg-dev (2018-01-12 00:52:10 UTC)
FEATURES
* sqg: Parallelize building of single and all packages by option -j.
Requires GNU Parallel.
@ -30,6 +30,8 @@ sbopkg-dev (2018-01-08 23:08:43 UTC)
* Remove SKIP_EMPTY option.
* Fix wrong glob expansion
Patch by Alan
* Use correct SlackBuild file name to build package
Patch by Erich Ritz
sbopkg 0.38.1 (2016-09-01 13:42 UTC)
FEATURES