Patchwork [1/1] busybox: add busybox_git.bb recipe

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date Nov. 29, 2013, 11:56 a.m.
Message ID <b47acc0003f5c8d6e963da9edcf910951bcbe7be.1385725803.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/62561/
State New
Headers show

Comments

Qi.Chen@windriver.com - Nov. 29, 2013, 11:56 a.m.
From: Chen Qi <Qi.Chen@windriver.com>

Add busybox_git.bb recipe so that it would be easier to hack with
busybox. Default the PREFERRED_VERSION to "1.21.1" so that we still
use busybox_1.21.1.bb as the default busybox recipe.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/conf/distro/include/default-versions.inc      |    2 +
 .../busybox-appletlib-dependency.patch             |    0
 ...usybox-list-suid-and-non-suid-app-configs.patch |    0
 ...sybox-sed-fix-sed-clusternewline-testcase.patch |    0
 .../busybox-sulogin-empty-root-password.patch      |    0
 .../busybox-udhcpc-no_deconfig.patch               |    0
 .../busybox/{busybox-1.21.1 => busybox}/defconfig  |    0
 .../fail_on_no_media.patch                         |    0
 .../get_header_tar.patch                           |    0
 .../login-utilities.cfg                            |    0
 .../run-parts.in.usr-bin.patch                     |    0
 .../{busybox-1.21.1 => busybox}/stat-usr-bin.patch |    0
 ...estsuite-du-du-k-works-fix-false-positive.patch |    0
 .../watch.in.usr-bin.patch                         |    0
 meta/recipes-core/busybox/busybox_git.bb           |   51 ++++++++++++++++++++
 15 files changed, 53 insertions(+)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/busybox-appletlib-dependency.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/busybox-list-suid-and-non-suid-app-configs.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/busybox-sed-fix-sed-clusternewline-testcase.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/busybox-sulogin-empty-root-password.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/busybox-udhcpc-no_deconfig.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/defconfig (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/fail_on_no_media.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/get_header_tar.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/login-utilities.cfg (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/run-parts.in.usr-bin.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/stat-usr-bin.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/testsuite-du-du-k-works-fix-false-positive.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.21.1 => busybox}/watch.in.usr-bin.patch (100%)
 create mode 100644 meta/recipes-core/busybox/busybox_git.bb
Ross Burton - Nov. 29, 2013, 12:04 p.m.
On 29 November 2013 11:56,  <Qi.Chen@windriver.com> wrote:
> +PREFERRED_VERSION_busybox ?= "1.21.1"

A better long-term solution is to set DEFAULT_PREFERENCE="-1" in the
git recipe itself.

Ross
Qi.Chen@windriver.com - Nov. 29, 2013, 12:07 p.m.
On 11/29/2013 08:04 PM, Burton, Ross wrote:
> On 29 November 2013 11:56,  <Qi.Chen@windriver.com> wrote:
>> +PREFERRED_VERSION_busybox ?= "1.21.1"
> A better long-term solution is to set DEFAULT_PREFERENCE="-1" in the
> git recipe itself.
>
> Ross
>
>

Thanks!

I'll send out a V2 :)

Best Regards,
Chen Qi

Patch

diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 53ec2e7..327a582 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -9,3 +9,5 @@  PREFERRED_VERSION_python-native ?= "2.7.3"
 
 # Force the older version of liberation-fonts until we fix the fontforge issue
 PREFERRED_VERSION_liberation-fonts ?= "1.04"
+
+PREFERRED_VERSION_busybox ?= "1.21.1"
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/busybox-appletlib-dependency.patch b/meta/recipes-core/busybox/busybox/busybox-appletlib-dependency.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/busybox-appletlib-dependency.patch
rename to meta/recipes-core/busybox/busybox/busybox-appletlib-dependency.patch
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/busybox-list-suid-and-non-suid-app-configs.patch b/meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/busybox-list-suid-and-non-suid-app-configs.patch
rename to meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/busybox-sed-fix-sed-clusternewline-testcase.patch b/meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/busybox-sed-fix-sed-clusternewline-testcase.patch
rename to meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/busybox-sulogin-empty-root-password.patch b/meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/busybox-sulogin-empty-root-password.patch
rename to meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/busybox-udhcpc-no_deconfig.patch
rename to meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/defconfig b/meta/recipes-core/busybox/busybox/defconfig
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/defconfig
rename to meta/recipes-core/busybox/busybox/defconfig
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch b/meta/recipes-core/busybox/busybox/fail_on_no_media.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch
rename to meta/recipes-core/busybox/busybox/fail_on_no_media.patch
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/get_header_tar.patch b/meta/recipes-core/busybox/busybox/get_header_tar.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/get_header_tar.patch
rename to meta/recipes-core/busybox/busybox/get_header_tar.patch
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/login-utilities.cfg b/meta/recipes-core/busybox/busybox/login-utilities.cfg
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/login-utilities.cfg
rename to meta/recipes-core/busybox/busybox/login-utilities.cfg
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch
rename to meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch b/meta/recipes-core/busybox/busybox/stat-usr-bin.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch
rename to meta/recipes-core/busybox/busybox/stat-usr-bin.patch
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/testsuite-du-du-k-works-fix-false-positive.patch b/meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/testsuite-du-du-k-works-fix-false-positive.patch
rename to meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch b/meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch
rename to meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb
new file mode 100644
index 0000000..399ea5b
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -0,0 +1,51 @@ 
+require busybox.inc
+
+SRCREV = "e73f3c1d3d83699b723251f7e6a981021ce75475"
+# Lookout for PV bump too when SRCREV is changed
+PV = "1.21.1+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+SRC_URI = "git://busybox.net/busybox.git \
+           file://get_header_tar.patch \
+           file://busybox-appletlib-dependency.patch \
+           file://run-parts.in.usr-bin.patch \
+           file://watch.in.usr-bin.patch \
+           file://busybox-udhcpc-no_deconfig.patch \
+           file://find-touchscreen.sh \
+           file://busybox-cron \
+           file://busybox-httpd \
+           file://busybox-udhcpd \
+           file://default.script \
+           file://simple.script \
+           file://hwclock.sh \
+           file://mount.busybox \
+           file://syslog \
+           file://syslog-startup.conf \
+           file://syslog.conf \
+           file://busybox-syslog.default \
+           file://mdev \
+           file://mdev.conf \
+           file://umount.busybox \
+           file://defconfig \
+           file://stat-usr-bin.patch \
+           file://busybox-syslog.service.in \
+           file://busybox-klogd.service.in \
+           file://testsuite-du-du-k-works-fix-false-positive.patch \
+           file://fail_on_no_media.patch \
+           file://busybox-sulogin-empty-root-password.patch \
+           file://run-ptest \
+           file://inetd.conf \
+           file://inetd \
+           file://login-utilities.cfg \
+           file://busybox-list-suid-and-non-suid-app-configs.patch \
+           file://busybox-sed-fix-sed-clusternewline-testcase.patch \
+"
+
+EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
+
+do_install_ptest () {
+        cp -r ${B}/testsuite ${D}${PTEST_PATH}/
+        cp ${B}/.config      ${D}${PTEST_PATH}/
+        ln -s /bin/busybox   ${D}${PTEST_PATH}/busybox
+}