summaryrefslogtreecommitdiffstats
path: root/package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-07-01 20:03:09 +0200
committerPeter Korsgaard <peter@korsgaard.com>2014-07-10 16:40:38 +0200
commitb18dca0df8a3f633e156dc18c2c698814c92baf8 (patch)
tree8adc570519a50a36118aaa5bb2e1edb38ee39089 /package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch
parent02d85f65768e8cbc6f6e9215b30ef6b3d3b26bff (diff)
downloadbuildroot-b18dca0df8a3f633e156dc18c2c698814c92baf8.tar.gz
buildroot-b18dca0df8a3f633e156dc18c2c698814c92baf8.zip
busybox: support only one version
This commit removes the version selection for the busybox package. Busybox is very well maintained, and bugs are typically fixed in a timely fashion. Moreover, regressions are fairly unlikely in this very stable and well-tested tool. Therefore, there isn't a very compelling reason to have a version selection for Busybox since we don't accept such a version selection for the vast majority of other packages, unless there is a strong reason to do so. Consequently, this commit: * Removes the 1.19.4, 1.20.2 and 1.21.1 Busybox versions, patches and default configuration file. * Moves the 1.22.1 patches from package/busybox/1.22.1 to just package/busybox/ like all other packages. * Renames the default 1.22.1 configuration file to just busybox.config. * Adapts the busybox.mk makefile to encode the current version to use. * Adds appropriate options to Config.in.legacy. However, even though the BR2_BUSYBOX_VERSION_1_22_X is removed, we don't add a Config.in.legacy option for it, since it would cause a legacy warning for virtually *all* users as most people are currently using 1.22.x. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch')
-rw-r--r--package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch b/package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch
deleted file mode 100644
index 456fb08e11..0000000000
--- a/package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- busybox-1.20.2/libbb/kernel_version.c
-+++ busybox-1.20.2-kernel_ver/libbb/kernel_version.c
-@@ -20,18 +20,15 @@
- int FAST_FUNC get_linux_version_code(void)
- {
- struct utsname name;
-- char *s;
-+ char *s, *t;
- int i, r;
-
-- if (uname(&name) == -1) {
-- bb_perror_msg("can't get system information");
-- return 0;
-- }
--
-+ uname(&name); /* never fails */
- s = name.release;
- r = 0;
- for (i = 0; i < 3; i++) {
-- r = r * 256 + atoi(strtok(s, "."));
-+ t = strtok(s, ".");
-+ r = r * 256 + (t ? atoi(t) : 0);
- s = NULL;
- }
- return r;
OpenPOWER on IntegriCloud