Message ID | 20200903084956.23337-1-heiko.thiery@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/1] package/netopeer2: fix patch | expand |
Heiko, All, On 2020-09-03 10:49 +0200, Heiko Thiery spake thusly: > Patch cannot be applied to bumped version anymore. So recreate on top of > current version. Initially, I was a bit puzzled why that patch slipped trhough during a version bump. But then I remembered we just merged next into master, so I looked and indeed we bumped the version in ext, and added the patch in master. So the merge introduced the issue. Next time, a cmall blurb to explain that would be nice. ;-) Applied to master, now. Thanks. Regards, Yann E. MORIN. > Also change the patch numbering from 0003 -> 0001 since the others are > dropped due to version bump. > > Fixes: > http://autobuild.buildroot.net/results/ec58bc318e0e2fd46c16814a4011a4847090e696/ > > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> > --- > ...upport-using-current-user-for-SR-mo.patch} | 19 +++++++------------ > 1 file changed, 7 insertions(+), 12 deletions(-) > rename package/netopeer2/{0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch => 0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch} (85%) > > diff --git a/package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch b/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > similarity index 85% > rename from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > rename to package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > index 45257b2ff4..76c71d0ff9 100644 > --- a/package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > +++ b/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > @@ -1,4 +1,4 @@ > -From 36ee1f33bceb0c2a7899e28d75c0d05408b561f1 Mon Sep 17 00:00:00 2001 > +From 4a950257fa353e27ef1bd753bca4d0279f41bc77 Mon Sep 17 00:00:00 2001 > From: Michal Vasko <mvasko@cesnet.cz> > Date: Mon, 24 Aug 2020 13:47:40 +0200 > Subject: [PATCH] scripts FEATURE support using current user for SR modules > @@ -7,18 +7,13 @@ Mostly for special cases user/group configuration > when the user/group cannot be retrieved normally. > > Fixes #701 > - > -Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> > -[patch taken from upstream: > -https://github.com/CESNET/netopeer2/commit/12a82701e10651fbdedb1524b27edf3bb2377488] > -Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> > --- > CMakeLists.txt | 10 +++++----- > scripts/setup.sh | 23 +++++++++++++++++++---- > 2 files changed, 24 insertions(+), 9 deletions(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > -index 2d4175e..95e7e61 100755 > +index 77aea1f..8fd6b43 100755 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -68,19 +68,19 @@ if(NOT MODULES_OWNER) > @@ -47,7 +42,7 @@ index 2d4175e..95e7e61 100755 > # set prefix for the PID file > if(NOT PIDFILE_PREFIX) > diff --git a/scripts/setup.sh b/scripts/setup.sh > -index 7175bc4..b5d1406 100755 > +index 9591a49..b7c7ba4 100755 > --- a/scripts/setup.sh > +++ b/scripts/setup.sh > @@ -1,7 +1,8 @@ > @@ -61,11 +56,11 @@ index 7175bc4..b5d1406 100755 > echo "Required environment variables not defined!" > exit 1 > fi > -@@ -33,7 +34,14 @@ MODULES=( > +@@ -37,7 +38,14 @@ MODULES=( > > # functions > INSTALL_MODULE() { > -- $SYSREPOCTL -a -i $MODDIR/$1 -s $MODDIR -p $PERMS -o $OWNER -g $GROUP -v2 > +- "$SYSREPOCTL" -a -i $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o "$OWNER" -g "$GROUP" -v2 > + CMD="'$SYSREPOCTL' -a -i $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2" > + if [ ! -z ${OWNER} ]; then > + CMD="$CMD -o '$OWNER'" > @@ -77,11 +72,11 @@ index 7175bc4..b5d1406 100755 > local rc=$? > if [ $rc -ne 0 ]; then > exit $rc > -@@ -41,7 +49,14 @@ INSTALL_MODULE() { > +@@ -45,7 +53,14 @@ INSTALL_MODULE() { > } > > UPDATE_MODULE() { > -- $SYSREPOCTL -a -U $MODDIR/$1 -s $MODDIR -p $PERMS -o $OWNER -g $GROUP -v2 > +- "$SYSREPOCTL" -a -U $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o "$OWNER" -g "$GROUP" -v2 > + CMD="'$SYSREPOCTL' -a -U $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2" > + if [ ! -z ${OWNER} ]; then > + CMD="$CMD -o '$OWNER'" > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Hi Yann, Am Do., 3. Sept. 2020 um 20:55 Uhr schrieb Yann E. MORIN < yann.morin.1998@free.fr>: > Heiko, All, > > On 2020-09-03 10:49 +0200, Heiko Thiery spake thusly: > > Patch cannot be applied to bumped version anymore. So recreate on top of > > current version. > > Initially, I was a bit puzzled why that patch slipped trhough during a > version bump. But then I remembered we just merged next into master, so > I looked and indeed we bumped the version in ext, and added the patch in > master. > > So the merge introduced the issue. Next time, a cmall blurb to explain > that would be nice. ;-) > I will try to do better next time ;-/ > > Applied to master, now. Thanks. > > Regards, > Yann E. MORIN. > > > Also change the patch numbering from 0003 -> 0001 since the others are > > dropped due to version bump. > > > > Fixes: > > > http://autobuild.buildroot.net/results/ec58bc318e0e2fd46c16814a4011a4847090e696/ > > > > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> > > --- > > ...upport-using-current-user-for-SR-mo.patch} | 19 +++++++------------ > > 1 file changed, 7 insertions(+), 12 deletions(-) > > rename > package/netopeer2/{0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > => 0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch} (85%) > > > > diff --git > a/package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > b/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > > similarity index 85% > > rename from > package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > > rename to > package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > > index 45257b2ff4..76c71d0ff9 100644 > > --- > a/package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > > +++ > b/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch > > @@ -1,4 +1,4 @@ > > -From 36ee1f33bceb0c2a7899e28d75c0d05408b561f1 Mon Sep 17 00:00:00 2001 > > +From 4a950257fa353e27ef1bd753bca4d0279f41bc77 Mon Sep 17 00:00:00 2001 > > From: Michal Vasko <mvasko@cesnet.cz> > > Date: Mon, 24 Aug 2020 13:47:40 +0200 > > Subject: [PATCH] scripts FEATURE support using current user for SR > modules > > @@ -7,18 +7,13 @@ Mostly for special cases user/group configuration > > when the user/group cannot be retrieved normally. > > > > Fixes #701 > > - > > -Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> > > -[patch taken from upstream: > > - > https://github.com/CESNET/netopeer2/commit/12a82701e10651fbdedb1524b27edf3bb2377488 > ] > > -Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> > > --- > > CMakeLists.txt | 10 +++++----- > > scripts/setup.sh | 23 +++++++++++++++++++---- > > 2 files changed, 24 insertions(+), 9 deletions(-) > > > > diff --git a/CMakeLists.txt b/CMakeLists.txt > > -index 2d4175e..95e7e61 100755 > > +index 77aea1f..8fd6b43 100755 > > --- a/CMakeLists.txt > > +++ b/CMakeLists.txt > > @@ -68,19 +68,19 @@ if(NOT MODULES_OWNER) > > @@ -47,7 +42,7 @@ index 2d4175e..95e7e61 100755 > > # set prefix for the PID file > > if(NOT PIDFILE_PREFIX) > > diff --git a/scripts/setup.sh b/scripts/setup.sh > > -index 7175bc4..b5d1406 100755 > > +index 9591a49..b7c7ba4 100755 > > --- a/scripts/setup.sh > > +++ b/scripts/setup.sh > > @@ -1,7 +1,8 @@ > > @@ -61,11 +56,11 @@ index 7175bc4..b5d1406 100755 > > echo "Required environment variables not defined!" > > exit 1 > > fi > > -@@ -33,7 +34,14 @@ MODULES=( > > +@@ -37,7 +38,14 @@ MODULES=( > > > > # functions > > INSTALL_MODULE() { > > -- $SYSREPOCTL -a -i $MODDIR/$1 -s $MODDIR -p $PERMS -o $OWNER -g > $GROUP -v2 > > +- "$SYSREPOCTL" -a -i $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o > "$OWNER" -g "$GROUP" -v2 > > + CMD="'$SYSREPOCTL' -a -i $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2" > > + if [ ! -z ${OWNER} ]; then > > + CMD="$CMD -o '$OWNER'" > > @@ -77,11 +72,11 @@ index 7175bc4..b5d1406 100755 > > local rc=$? > > if [ $rc -ne 0 ]; then > > exit $rc > > -@@ -41,7 +49,14 @@ INSTALL_MODULE() { > > +@@ -45,7 +53,14 @@ INSTALL_MODULE() { > > } > > > > UPDATE_MODULE() { > > -- $SYSREPOCTL -a -U $MODDIR/$1 -s $MODDIR -p $PERMS -o $OWNER -g > $GROUP -v2 > > +- "$SYSREPOCTL" -a -U $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o > "$OWNER" -g "$GROUP" -v2 > > + CMD="'$SYSREPOCTL' -a -U $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2" > > + if [ ! -z ${OWNER} ]; then > > + CMD="$CMD -o '$OWNER'" > > -- > > 2.20.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot@busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot > > -- > > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' > conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ > | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is > no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v > conspiracy. | > > '------------------------------^-------^------------------^--------------------' >
diff --git a/package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch b/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch similarity index 85% rename from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch rename to package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch index 45257b2ff4..76c71d0ff9 100644 --- a/package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +++ b/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch @@ -1,4 +1,4 @@ -From 36ee1f33bceb0c2a7899e28d75c0d05408b561f1 Mon Sep 17 00:00:00 2001 +From 4a950257fa353e27ef1bd753bca4d0279f41bc77 Mon Sep 17 00:00:00 2001 From: Michal Vasko <mvasko@cesnet.cz> Date: Mon, 24 Aug 2020 13:47:40 +0200 Subject: [PATCH] scripts FEATURE support using current user for SR modules @@ -7,18 +7,13 @@ Mostly for special cases user/group configuration when the user/group cannot be retrieved normally. Fixes #701 - -Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> -[patch taken from upstream: -https://github.com/CESNET/netopeer2/commit/12a82701e10651fbdedb1524b27edf3bb2377488] -Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> --- CMakeLists.txt | 10 +++++----- scripts/setup.sh | 23 +++++++++++++++++++---- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d4175e..95e7e61 100755 +index 77aea1f..8fd6b43 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,19 +68,19 @@ if(NOT MODULES_OWNER) @@ -47,7 +42,7 @@ index 2d4175e..95e7e61 100755 # set prefix for the PID file if(NOT PIDFILE_PREFIX) diff --git a/scripts/setup.sh b/scripts/setup.sh -index 7175bc4..b5d1406 100755 +index 9591a49..b7c7ba4 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,7 +1,8 @@ @@ -61,11 +56,11 @@ index 7175bc4..b5d1406 100755 echo "Required environment variables not defined!" exit 1 fi -@@ -33,7 +34,14 @@ MODULES=( +@@ -37,7 +38,14 @@ MODULES=( # functions INSTALL_MODULE() { -- $SYSREPOCTL -a -i $MODDIR/$1 -s $MODDIR -p $PERMS -o $OWNER -g $GROUP -v2 +- "$SYSREPOCTL" -a -i $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o "$OWNER" -g "$GROUP" -v2 + CMD="'$SYSREPOCTL' -a -i $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2" + if [ ! -z ${OWNER} ]; then + CMD="$CMD -o '$OWNER'" @@ -77,11 +72,11 @@ index 7175bc4..b5d1406 100755 local rc=$? if [ $rc -ne 0 ]; then exit $rc -@@ -41,7 +49,14 @@ INSTALL_MODULE() { +@@ -45,7 +53,14 @@ INSTALL_MODULE() { } UPDATE_MODULE() { -- $SYSREPOCTL -a -U $MODDIR/$1 -s $MODDIR -p $PERMS -o $OWNER -g $GROUP -v2 +- "$SYSREPOCTL" -a -U $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o "$OWNER" -g "$GROUP" -v2 + CMD="'$SYSREPOCTL' -a -U $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2" + if [ ! -z ${OWNER} ]; then + CMD="$CMD -o '$OWNER'"
Patch cannot be applied to bumped version anymore. So recreate on top of current version. Also change the patch numbering from 0003 -> 0001 since the others are dropped due to version bump. Fixes: http://autobuild.buildroot.net/results/ec58bc318e0e2fd46c16814a4011a4847090e696/ Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> --- ...upport-using-current-user-for-SR-mo.patch} | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) rename package/netopeer2/{0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch => 0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch} (85%)