Skip to contentSkip to conversation

package/netopeer2: fix patch

PATCH New Heiko Thiery 2 participants 3 messages Sep 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/netopeer2: fix patch

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/

---
 ...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%)
package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch renamed from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +7 -12
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
@@ -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 <[email protected]>
 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 <[email protected]>
-[patch taken from upstream:
-https://github.com/CESNET/netopeer2/commit/12a82701e10651fbdedb1524b27edf3bb2377488]
-Signed-off-by: Heiko Thiery <[email protected]>
 ---
  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'"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/netopeer2: fix patch

Heiko, All,

On 2020-09-03 10:49 +0200, Heiko Thiery spake thusly:

Quoted 2 lines

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.

Quoted 89 lines

Also change the patch numbering from 0003 -> 0001 since the others are dropped due to version bump.

Fixes:
http://autobuild.buildroot.net/results/ec58bc318e0e2fd46c16814a4011a4847090e696/

---
 ...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%)
package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch renamed from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +7 -12
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
@@ -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 <[email protected]>
 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 <[email protected]>
-[patch taken from upstream:
-https://github.com/CESNET/netopeer2/commit/12a82701e10651fbdedb1524b27edf3bb2377488]
-Signed-off-by: Heiko Thiery <[email protected]>
 ---
  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'"
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/netopeer2: fix patch

Hi Yann,

Am Do., 3. Sept. 2020 um 20:55 Uhr schrieb Yann E. MORIN < [email protected]>:

Quoted 6 lines

Heiko, All,

On 2020-09-03 10:49 +0200, Heiko Thiery spake thusly:

Quoted 2 lines

Patch cannot be applied to bumped version anymore. So recreate on top of current version.

Quoted 8 lines

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 ;-/

Quoted 124 lines

Applied to master, now. Thanks.

Regards,
Yann E. MORIN.

Quoted 5 lines

Also change the patch numbering from 0003 -> 0001 since the others are dropped due to version bump.

Fixes:

http://autobuild.buildroot.net/results/ec58bc318e0e2fd46c16814a4011a4847090e696/

Quoted 6 lines
---
 ...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%)

Quoted 2 lines

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

Quoted 2 lines

similarity index 85%
rename from

package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch

Quoted 1 line

rename to

package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch

Quoted 2 lines

index 45257b2ff4..76c71d0ff9 100644
---

a/package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch

Quoted 1 line

+++

b/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch

package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch line 4

Quoted 6 lines
package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch renamed from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +1 -1
@@ -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 <[email protected]>
 Date: Mon, 24 Aug 2020 13:47:40 +0200
 Subject: [PATCH] scripts FEATURE support using current user for SR

modules

package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch Mostly for special cases user/group configuration · line 13

Quoted 8 lines
package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch renamed from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +0 -4
@@ -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 <[email protected]>
-[patch taken from upstream:
-

https://github.com/CESNET/netopeer2/commit/12a82701e10651fbdedb1524b27edf3bb2377488
]

Quoted 22 lines
package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch renamed from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +2 -3
-Signed-off-by: Heiko Thiery <[email protected]>
 ---
  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 @@

package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch index 7175bc4..b5d1406 100755 · line 68

Quoted 9 lines
package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch renamed from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +1 -2
@@ -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

Review index 7175bc4..b5d1406 100755 · line 63

Quoted 1 line
(quoted diff) +1 -0
+-    "$SYSREPOCTL" -a -i $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o

"$OWNER" -g "$GROUP" -v2

package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch index 7175bc4..b5d1406 100755 · line 84

Quoted 13 lines
package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch renamed from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +1 -2
 +    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

Review index 7175bc4..b5d1406 100755 · line 79

Quoted 1 line
(quoted diff) +1 -0
+-    "$SYSREPOCTL" -a -U $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o

"$OWNER" -g "$GROUP" -v2

Quoted 10 lines
package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch renamed from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +0 -1
 +    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 at 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.  |
Quoted 2 lines

'------------------------------^-------^------------------^--------------------'

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200903/48ee61b3/attachment.html>