- We have to add additional ".." to the path we want to check. $PWD is
already $srcdir. This bug was the only reason that it did not trigger
futher bugs in the "true" case.
- If we don't find an APKBUILD for the kernel flavor, error out
- We are in a sub-shell, we do not have to protect $pkgname
- We have to add "return 0", otherwise in the positive case where the
last check succeeds, it sets the sub-shell return value to 1, which
then triggers the failure path.
---
testing/drbd9-grsec/APKBUILD | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/testing/drbd9-grsec/APKBUILD b/testing/drbd9-grsec/APKBUILD
index b9922c0..258163c 100644
--- a/testing/drbd9-grsec/APKBUILD+++ b/testing/drbd9-grsec/APKBUILD
@@ -33,14 +33,15 @@ _builddir=$srcdir/$_usname-$_usver
prepare() {
local i
# verify the kernel version
- (if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then- _name=$pkgname- . ../../main/linux-${_flavor}/APKBUILD- pkgname=$_name+ (if [ -f ../../../main/linux-${_flavor}/APKBUILD ]; then+ . ../../../main/linux-${_flavor}/APKBUILD [ "$_kver" != "$pkgver" ] \
&& die "please update _kver to $pkgver"
[ "$_kpkgrel" != "$pkgrel" ] \
&& die "please update _kpkgrel to $pkgrel"
+ return 0+ else+ die "could not determine kernel flavor: linux-${_flavor}" fi) || return 1
--
2.6.4
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---
On Tue, 5 Jan 2016 18:25:36 +0100
Roland Kammerer <roland.kammerer@linbit.com> wrote:
> - We have to add additional ".." to the path we want to check. $PWD is> already $srcdir. This bug was the only reason that it did not trigger> futher bugs in the "true" case.> - If we don't find an APKBUILD for the kernel flavor, error out> - We are in a sub-shell, we do not have to protect $pkgname> - We have to add "return 0", otherwise in the positive case where the> last check succeeds, it sets the sub-shell return value to 1, which> then triggers the failure path.> ---> testing/drbd9-grsec/APKBUILD | 9 +++++----> 1 file changed, 5 insertions(+), 4 deletions(-)> > diff --git a/testing/drbd9-grsec/APKBUILD b/testing/drbd9-grsec/APKBUILD> index b9922c0..258163c 100644> --- a/testing/drbd9-grsec/APKBUILD> +++ b/testing/drbd9-grsec/APKBUILD> @@ -33,14 +33,15 @@ _builddir=$srcdir/$_usname-$_usver> prepare() {> local i> # verify the kernel version> - (if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then> - _name=$pkgname> - . ../../main/linux-${_flavor}/APKBUILD> - pkgname=$_name> + (if [ -f ../../../main/linux-${_flavor}/APKBUILD ]; then> + . ../../../main/linux-${_flavor}/APKBUILD
I think we want a "cd $startdir" instead
> [ "$_kver" != "$pkgver" ] \> && die "please update _kver to $pkgver"> [ "$_kpkgrel" != "$pkgrel" ] \> && die "please update _kpkgrel to $pkgrel"> + return 0> + else> + die "could not determine kernel flavor: linux-${_flavor}"> fi) || return 1>
maybe move the return 0 til right before the closing )?
-nc
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---
On Wed, Jan 06, 2016 at 02:09:06PM +0100, Natanael Copa wrote:
> On Tue, 5 Jan 2016 18:25:36 +0100> Roland Kammerer <roland.kammerer@linbit.com> wrote:> > > - We have to add additional ".." to the path we want to check. $PWD is> > already $srcdir. This bug was the only reason that it did not trigger> > futher bugs in the "true" case.> > - If we don't find an APKBUILD for the kernel flavor, error out> > - We are in a sub-shell, we do not have to protect $pkgname> > - We have to add "return 0", otherwise in the positive case where the> > last check succeeds, it sets the sub-shell return value to 1, which> > then triggers the failure path.> > ---> > testing/drbd9-grsec/APKBUILD | 9 +++++----> > 1 file changed, 5 insertions(+), 4 deletions(-)> > > > diff --git a/testing/drbd9-grsec/APKBUILD b/testing/drbd9-grsec/APKBUILD> > index b9922c0..258163c 100644> > --- a/testing/drbd9-grsec/APKBUILD> > +++ b/testing/drbd9-grsec/APKBUILD> > @@ -33,14 +33,15 @@ _builddir=$srcdir/$_usname-$_usver> > prepare() {> > local i> > # verify the kernel version> > - (if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then> > - _name=$pkgname> > - . ../../main/linux-${_flavor}/APKBUILD> > - pkgname=$_name> > + (if [ -f ../../../main/linux-${_flavor}/APKBUILD ]; then> > + . ../../../main/linux-${_flavor}/APKBUILD> > I think we want a "cd $startdir" instead> > > [ "$_kver" != "$pkgver" ] \> > && die "please update _kver to $pkgver"> > [ "$_kpkgrel" != "$pkgrel" ] \> > && die "please update _kpkgrel to $pkgrel"> > + return 0> > + else> > + die "could not determine kernel flavor: linux-${_flavor}"> > fi) || return 1> > > > maybe move the return 0 til right before the closing )?
Both changes makes sense to me, new patch attached.
Regards, rck