From c8fb0b0aca2ff395a6e94556ad6991ad0c51c5f4 Mon Sep 17 00:00:00 2001 From: Antoine Catton <acatton@tiolive.com> Date: Thu, 9 Aug 2012 18:07:44 +0900 Subject: [PATCH] Version up : busybox 1.20.1 Remove busybox dirty hack since the workarounded problem is fixed in new version. --- component/busybox/buildout.cfg | 20 +++--------------- .../busybox/busybox-1.19.3.packed_hack.patch | 21 ------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 component/busybox/busybox-1.19.3.packed_hack.patch diff --git a/component/busybox/buildout.cfg b/component/busybox/buildout.cfg index ed6057fb9..c80801a29 100644 --- a/component/busybox/buildout.cfg +++ b/component/busybox/buildout.cfg @@ -1,28 +1,14 @@ [buildout] -extends = - ../patch/buildout.cfg -# https://bugs.busybox.net/show_bug.cgi?id=4838 -[busybox-1.19.3.packed_hack.patch] -recipe = hexagonit.recipe.download -url = ${:_profile_base_location_}/${:filename} -md5sum = faa5ce46be086763202d7ca24601fbde -filename = busybox-1.19.3.packed_hack.patch -download-only = true +parts = busybox [busybox] recipe = slapos.recipe.build -url = http://busybox.net/downloads/busybox-1.19.4.tar.bz2 -md5sum = 9c0cae5a0379228e7b55e5b29528df8e -patch-binary = ${patch:location}/bin/patch -patch-options = -p1 -patches = - ${busybox-1.19.3.packed_hack.patch:location}/${busybox-1.19.3.packed_hack.patch:filename} +url = http://git.busybox.net/busybox/snapshot/busybox-1_20_1.tar.gz +md5sum = 15758fc37ae8051d6def1b8afb691821 script = extract_dir = self.extract(self.download(%(url)r, %(md5sum)r)) workdir = guessworkdir(extract_dir) - self.applyPatchList(self.options.get('patches'), self.options.get('patch-options'), self.options.get('patch-binary'), workdir) - call(['patch', 'defconfig'], cwd=workdir, env=env) self.logger.info("Creating default configuration") call(['make', 'defconfig'], cwd=workdir, env=env) self.logger.info("Building") diff --git a/component/busybox/busybox-1.19.3.packed_hack.patch b/component/busybox/busybox-1.19.3.packed_hack.patch deleted file mode 100644 index d5e9593a3..000000000 --- a/component/busybox/busybox-1.19.3.packed_hack.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c -index 2a426db..35f44ac 100644 ---- a/miscutils/ubi_tools.c -+++ b/miscutils/ubi_tools.c -@@ -60,6 +60,16 @@ - //kbuild:lib-$(CONFIG_UBIUPDATEVOL) += ubi_tools.o - - #include "libbb.h" -+#if 1 -+// __packed hack for broken kernel headers ubi-user.h -+// See: https://lkml.org/lkml/2011/6/22/25 -+// Once ubi-user.h is correctly installed without "__packed", or kernel -+// guys correct this another way (with a compiler header??), this can -+// go away. -+# ifndef __packed -+# define __packed __attribute__((packed)) -+# endif // ndef __packed -+#endif // 1 - #include <mtd/ubi-user.h> - - #define OPTION_M (1 << 0) -- 2.30.9