Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
alpine
abuild
Commits
9b04be2f
Commit
9b04be2f
authored
Oct 23, 2018
by
Disassembler .
Committed by
Natanael Copa
Jan 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
abuild: replace $0 with $abuild_path, add $forceroot where missing
parent
90962395
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
abuild.in
abuild.in
+6
-6
No files found.
abuild.in
View file @
9b04be2f
...
...
@@ -760,7 +760,7 @@ prepare_subpackages() {
#
call
abuild
recursively
,
setting
subpkg
{
dir
,
name
}
(
subpkg_set
"$i"
;
msg
"Running split function $subpkgsplit..."
;
\
subpkgdir
=
"$pkgbasedir/$subpkgname"
subpkgname
=
"$subpkgname"
subpkgarch
=
"$subpkgarch"
\
$
0
pre_split
$
subpkgsplit
prepare_package
\
"$abuild_path"
$
forceroot
pre_split
$
subpkgsplit
prepare_package
\
&&
postcheck
"$pkgbasedir/$subpkgname"
"$subpkgname"
)
||
return
1
done
postcheck
"$pkgdir"
"$pkgname"
||
return
1
...
...
@@ -813,7 +813,7 @@ prepare_language_packs() {
lang
=
"$lang"
\
subpkgname
=
"$pkgname-lang-$lang"
\
subpkgdir
=
"$pkgbasedir"
/$
subpkgname
\
$
0
lang_subpkg
prepare_package
||
return
1
"$abuild_path"
$
forceroot
lang_subpkg
prepare_package
||
return
1
done
}
...
...
@@ -937,7 +937,7 @@ prepare_metafiles() {
subpkgarch
=
"$arch"
fi
echo
"# Generated by $(basename
$0
) $program_version"
>
"$pkginfo"
echo
"# Generated by $(basename
"
$
abuild_path
"
) $program_version"
>
"$pkginfo"
if
[
-
n
"$FAKEROOTKEY"
];
then
echo
"# using $($FAKEROOT -v)"
>>
"$pkginfo"
fi
...
...
@@ -1763,7 +1763,7 @@ do_fakeroot() {
check_fakeroot
()
{
cd
"$startdir"
[
-
n
"$FAKEROOT"
]
&&
msg
"Entering fakeroot..."
do_fakeroot
"$abuild_path"
$
color_opt
$
keep_build
check
do_fakeroot
"$abuild_path"
$
forceroot
$
color_opt
$
keep_build
check
}
#
build
and
package
in
fakeroot
...
...
@@ -1771,7 +1771,7 @@ rootpkg() {
cd
"$startdir"
rm
-
rf
"$pkgdir"
[
-
n
"$FAKEROOT"
]
&&
msg
"Entering fakeroot..."
do_fakeroot
"$abuild_path"
$
color_opt
$
keep_build
\
do_fakeroot
"$abuild_path"
$
forceroot
$
color_opt
$
keep_build
\
package
\
prepare_subpackages
\
prepare_language_packs
\
...
...
@@ -2090,7 +2090,7 @@ builddeps() {
export
ABUILD_VISITED
=
"$ABUILD_VISITED $pkg"
msg
"Entering $dir"
cd
"$dir"
&&
$
0
$
forceroot
$
keep
$
keep_build
$
quiet
\
cd
"$dir"
&&
"$abuild_path"
$
forceroot
$
keep
$
keep_build
$
quiet
\
$
install_deps
$
recursive
$
upgrade
$
color_opt
\
abuildindex
||
return
1
done
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment