Skip to contentSkip to conversation

busybox: rename patches as per the new standard and update 1.21.0 mdev

PATCH New Gustavo Zacarias 3 participants 7 messages Apr 23, 2013 – Apr 24, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 busybox: rename patches as per the new standard and update 1.21.0 mdev

Rename patches as per the patch naming policy and update the mdev fix patch for 1.21.0 which reinstates subsystem matching functionality.

---
 ...x-1.19.4-udhcp.patch => busybox-01-udhcp.patch} |   0
 ...ernel_ver.patch => busybox-01-kernel_ver.patch} |   0
 ...box-1.20.2-ntpd.patch => busybox-02-ntpd.patch} |   0
 ...x.patch => busybox-03-pkg-config-selinux.patch} |   0
 ...esource.patch => busybox-04-sys-resource.patch} |   0
 package/busybox/1.21.0/busybox-01-mdev.patch       | 643 +++++++++++++++++++++
 ....0-platform.patch => busybox-02-platform.patch} |   0
 ...busybox-1.21.0-xz.patch => busybox-03-xz.patch} |   0
 package/busybox/1.21.0/busybox-1.21.0-mdev.patch   |  35 --
 9 files changed, 643 insertions(+), 35 deletions(-)
 rename package/busybox/1.19.4/{busybox-1.19.4-udhcp.patch => busybox-01-udhcp.patch} (100%)
 rename package/busybox/1.20.2/{busybox-1.20.2-kernel_ver.patch => busybox-01-kernel_ver.patch} (100%)
 rename package/busybox/1.20.2/{busybox-1.20.2-ntpd.patch => busybox-02-ntpd.patch} (100%)
 rename package/busybox/1.20.2/{busybox-1.20.2-pkg-config-selinux.patch => busybox-03-pkg-config-selinux.patch} (100%)
 rename package/busybox/1.20.2/{busybox-1.20.2-sys-resource.patch => busybox-04-sys-resource.patch} (100%)
 create mode 100644 package/busybox/1.21.0/busybox-01-mdev.patch
 rename package/busybox/1.21.0/{busybox-1.21.0-platform.patch => busybox-02-platform.patch} (100%)
 rename package/busybox/1.21.0/{busybox-1.21.0-xz.patch => busybox-03-xz.patch} (100%)
 delete mode 100644 package/busybox/1.21.0/busybox-1.21.0-mdev.patch
package/busybox/1.19.4/busybox-01-udhcp.patch renamed from package/busybox/1.19.4/busybox-1.19.4-udhcp.patch +0 -0
similarity index 100%
rename from package/busybox/1.19.4/busybox-1.19.4-udhcp.patch
rename to package/busybox/1.19.4/busybox-01-udhcp.patch
package/busybox/1.20.2/busybox-01-kernel_ver.patch renamed from package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch +0 -0
similarity index 100%
rename from package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch
rename to package/busybox/1.20.2/busybox-01-kernel_ver.patch
package/busybox/1.20.2/busybox-02-ntpd.patch renamed from package/busybox/1.20.2/busybox-1.20.2-ntpd.patch +0 -0
similarity index 100%
rename from package/busybox/1.20.2/busybox-1.20.2-ntpd.patch
rename to package/busybox/1.20.2/busybox-02-ntpd.patch
package/busybox/1.20.2/busybox-03-pkg-config-selinux.patch renamed from package/busybox/1.20.2/busybox-1.20.2-pkg-config-selinux.patch +0 -0
similarity index 100%
rename from package/busybox/1.20.2/busybox-1.20.2-pkg-config-selinux.patch
rename to package/busybox/1.20.2/busybox-03-pkg-config-selinux.patch
package/busybox/1.20.2/busybox-04-sys-resource.patch renamed from package/busybox/1.20.2/busybox-1.20.2-sys-resource.patch +0 -0
similarity index 100%
rename from package/busybox/1.20.2/busybox-1.20.2-sys-resource.patch
rename to package/busybox/1.20.2/busybox-04-sys-resource.patch
package/busybox/1.21.0/busybox-01-mdev.patch new file +643 -0

643 lines not on this page · raw message

package/busybox/1.21.0/busybox-02-platform.patch renamed from package/busybox/1.21.0/busybox-1.21.0-platform.patch +0 -0
similarity index 100%
rename from package/busybox/1.21.0/busybox-1.21.0-platform.patch
rename to package/busybox/1.21.0/busybox-02-platform.patch
package/busybox/1.21.0/busybox-03-xz.patch renamed from package/busybox/1.21.0/busybox-1.21.0-xz.patch +0 -0
similarity index 100%
rename from package/busybox/1.21.0/busybox-1.21.0-xz.patch
rename to package/busybox/1.21.0/busybox-03-xz.patch
package/busybox/1.21.0/busybox-1.21.0-mdev.patch deleted +0 -35
deleted file mode 100644
index cb873fa..0000000
@@ -1,35 +0,0 @@
---- busybox-1.21.0/util-linux/mdev.c
-+++ busybox-1.21.0-mdev/util-linux/mdev.c
-@@ -661,6 +661,8 @@ static void make_device(char *device_nam
- 			if (mknod(node_name, rule->mode | type, makedev(major, minor)) && errno != EEXIST)
- 				bb_perror_msg("can't create '%s'", node_name);
- 			if (ENABLE_FEATURE_MDEV_CONF) {
-+				if (G.verbose)
-+					bb_error_msg("chmod: %o chown: %u:%u", rule->mode, rule->ugid.uid, rule->ugid.gid);
- 				chmod(node_name, rule->mode);
- 				chown(node_name, rule->ugid.uid, rule->ugid.gid);
- 			}
-@@ -813,6 +815,7 @@ static void load_firmware(const char *fi
- 		full_write(loading_fd, "-1", 2);
- 
-  out:
-+	xchdir("/dev");
- 	if (ENABLE_FEATURE_CLEAN_UP) {
- 		close(firmware_fd);
- 		close(loading_fd);
-@@ -919,11 +922,13 @@ int mdev_main(int argc UNUSED_PARAM, cha
- 		}
- 
- 		{
--			int logfd = open("/dev/mdev.log", O_WRONLY | O_APPEND);
-+			int logfd = open("mdev.log", O_WRONLY | O_APPEND);
- 			if (logfd >= 0) {
- 				xmove_fd(logfd, STDERR_FILENO);
- 				G.verbose = 1;
--				bb_error_msg("seq: %s action: %s", seq, action);
-+				if (seq)
-+					applet_name = xasprintf("%s[%s]", applet_name, seq);
-+				bb_error_msg("action: %s", action);
- 			}
- 		}
- 
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/1 busybox: rename patches as per the new standard and update 1.21.0 mdev

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Rename patches as per the patch naming policy and update the Gustavo> mdev fix patch for 1.21.0 which reinstates subsystem matching Gustavo> functionality.

Sorry, I disagree with this rename. I know this is what we discussed at the dev day, but it imho makes more sense to use the upstream naming convention for busybox:

http://busybox.net/downloads/fixes-1.21.0/

Could you send a patch that only updates the mdev bugfix instead?

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 busybox: rename patches as per the new standard and update 1.21.0 mdev

Quoted 7 lines · Peter Korsgaard

Sorry, I disagree with this rename. I know this is what we discussed at the dev day, but it imho makes more sense to use the upstream naming convention for busybox:

http://busybox.net/downloads/fixes-1.21.0/

Could you send a patch that only updates the mdev bugfix instead?

Sure, i just wanted the official "go" or "no go" as discussed with Arnout so i went with the renaming to get a definitive answer to the dilemma.
Maybe an update to the docs is in order to reflect this? For instance "if upstream has versioned patches then it should be respected" or something like that?
Regards.

#3 lore raw

PATCH 1/1 busybox: rename patches as per the new standard and update 1.21.0 mdev

In reply to Peter Korsgaard
Quoted 11 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Rename patches as per the patch naming policy and update the Gustavo> mdev fix patch for 1.21.0 which reinstates subsystem matching Gustavo> functionality.

Sorry, I disagree with this rename. I know this is what we discussed at the dev day, but it imho makes more sense to use the upstream naming convention for busybox:

http://busybox.net/downloads/fixes-1.21.0/

Actually, if upstream has the patches available for download, they
should be downloaded instead of of included in buildroot, no?

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#4 lore raw

PATCH 1/1 busybox: rename patches as per the new standard and update 1.21.0 mdev

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

Quoted 2 lines · Peter Korsgaard
Quoted 2 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Rename patches as per the patch naming policy and update the Gustavo> mdev fix patch for 1.21.0 which reinstates subsystem matching Gustavo> functionality.

Quoted 6 lines
Quoted 6 lines

Sorry, I disagree with this rename. I know this is what we discussed at the dev day, but it imho makes more sense to use the upstream naming convention for busybox:

http://busybox.net/downloads/fixes-1.21.0/

Arnout> Actually, if upstream has the patches available for download, Arnout> they should be downloaded instead of of included in buildroot, Arnout> no?

True. For busybox our patch download infrastructure unfortunately doesn't work as the patches aren't located in the same directory as the tarball (and the fact that we support multiple versions also makes it a bit more complicated).

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/1 busybox: rename patches as per the new standard and update 1.21.0 mdev

Quoted 8 lines · Peter Korsgaard

Arnout> Actually, if upstream has the patches available for download, Arnout> they should be downloaded instead of of included in buildroot, Arnout> no?

True. For busybox our patch download infrastructure unfortunately doesn't work as the patches aren't located in the same directory as the tarball (and the fact that we support multiple versions also makes it a bit more complicated).

The problem with downloading busybox patches directly is that upstream kind of sucks regarding naming and updates.
For instance the mdev patch changed without being reflected in the filename, and so did other patches in the past.
This could cause unexpected behaviour depending on which patch each user got, specially when they're being early adopters of new versions and using a common download directory.
Telling people to "remove your patches to force a new download and try again" would just be adding unnecessary noise/bugs.
Regards.

#6 lore raw

PATCH 1/1 busybox: rename patches as per the new standard and update 1.21.0 mdev

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Hi,

Gustavo> The problem with downloading busybox patches directly is that Gustavo> upstream kind of sucks regarding naming and updates. For Gustavo> instance the mdev patch changed without being reflected in the Gustavo> filename, and so did other patches in the past. This could Gustavo> cause unexpected behaviour depending on which patch each user Gustavo> got, specially when they're being early adopters of new Gustavo> versions and using a common download directory. Telling Gustavo> people to "remove your patches to force a new download and try Gustavo> again" would just be adding unnecessary noise/bugs.

Indeed. I think the only sane option is to bundle the busybox patches in BR until upstream changes their ways.

Signature · 1 line
Bye, Peter Korsgaard