From 8289ecd6699ebc12c35d9e42d329cf6ff77e1e33 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Tue, 12 Mar 2013 09:20:30 +0000 Subject: busybox: remove SDK specific bits There are three kinds of SDK specific bits: (1) deleted: busybox-1.20.2/busybox-1.19.4-ubi-user-h.patch This patch is just a workground to fix busybox 1.9 builds when enabling ubi applets (disabled by default in Yocto). The actual fix exists in kernel, but was not applied on fsl kernel git tree for SDK 1.3.x. This patch restored a compatible mtd/ubi-user.h into busybox. Now the kernel fix was already included in Yocto: http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.2/commit/?id=f210735fe2f17a6225432ee3d1239bcf23a8659c http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.4/commit/?id=f210735fe2f17a6225432ee3d1239bcf23a8659c http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.8/commit/?id=f210735fe2f17a6225432ee3d1239bcf23a8659c commit f210735fe2f17a6225432ee3d1239bcf23a8659c headers_install: fix __packed in exported kernel headers And fsl SDK 1.4 will based on kernel 3.8 which also include this commit. So this patch can be dropped. (2) deleted: busybox-1.20.2/defconfig-fsl This defconfig is SDK specific. Remove it. (3) deleted: busybox-1.20.2/inetd{.conf} There is already submitted patches for this, but not applied: [PATCH] busybox: Add inetd related files http://patches.openembedded.org/patch/33233/ http://patches.openembedded.org/patch/33235/ The issue still exist and we will send new patches. Signed-off-by: Ting Liu --- recipes-append/busybox/busybox_1.20.2.bbappend | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'recipes-append/busybox/busybox_1.20.2.bbappend') diff --git a/recipes-append/busybox/busybox_1.20.2.bbappend b/recipes-append/busybox/busybox_1.20.2.bbappend index 9c52eeb..8445337 100644 --- a/recipes-append/busybox/busybox_1.20.2.bbappend +++ b/recipes-append/busybox/busybox_1.20.2.bbappend @@ -1,15 +1,2 @@ -PR_append_fsl = "+${DISTRO}.0" - -FILESEXTRAPATHS_prepend_fsl := "${THISDIR}/busybox-1.20.2:" - -SRC_URI_append_fsl += "file://defconfig-fsl \ - file://busybox-1.19.4-ubi-user-h.patch \ - file://inetd \ - file://inetd.conf \ -" - -do_configure_prepend_fsl () { - cp ${WORKDIR}/defconfig-fsl ${WORKDIR}/defconfig -} - +PRINC := "${@int(PRINC) + 1}" -- cgit v1.2.3-54-g00ecf