aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei.gherzan@windriver.com>2015-06-24 18:37:00 +0200
committerYong-iL Joh <yong-il.joh@windriver.com>2015-09-09 19:24:00 +0900
commit8fd825b1203379960768677cabde919d3870492d (patch)
treeb8bfd226cffeeb38a4948d22f15fd92d278c2171
parent60b544076639cbf75a8017d093621acfc8d4b902 (diff)
downloadmeta-ivi-8fd825b1203379960768677cabde919d3870492d.tar.gz
meta-ivi-8fd825b1203379960768677cabde919d3870492d.tar.bz2
meta-ivi-8fd825b1203379960768677cabde919d3870492d.zip
busybox: Synchronize bbappend version with poky
As well we don't configure busybox with syslog so remove it. Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
-rw-r--r--meta-ivi/recipes-core-ivi/busybox/busybox/defconfig (renamed from meta-ivi/recipes-core-ivi/busybox/busybox-1.21.1/defconfig)0
-rw-r--r--meta-ivi/recipes-core-ivi/busybox/busybox_1.22.1.bbappend2
-rw-r--r--meta-ivi/recipes-core-ivi/busybox/busybox_1.23.1.bbappend8
3 files changed, 8 insertions, 2 deletions
diff --git a/meta-ivi/recipes-core-ivi/busybox/busybox-1.21.1/defconfig b/meta-ivi/recipes-core-ivi/busybox/busybox/defconfig
index 6094166..6094166 100644
--- a/meta-ivi/recipes-core-ivi/busybox/busybox-1.21.1/defconfig
+++ b/meta-ivi/recipes-core-ivi/busybox/busybox/defconfig
diff --git a/meta-ivi/recipes-core-ivi/busybox/busybox_1.22.1.bbappend b/meta-ivi/recipes-core-ivi/busybox/busybox_1.22.1.bbappend
deleted file mode 100644
index 14ee104..0000000
--- a/meta-ivi/recipes-core-ivi/busybox/busybox_1.22.1.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}-${PV}"
-SRC_URI += "file://defconfig"
diff --git a/meta-ivi/recipes-core-ivi/busybox/busybox_1.23.1.bbappend b/meta-ivi/recipes-core-ivi/busybox/busybox_1.23.1.bbappend
new file mode 100644
index 0000000..d368d16
--- /dev/null
+++ b/meta-ivi/recipes-core-ivi/busybox/busybox_1.23.1.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+SRC_URI += "file://defconfig"
+
+# Defconfig doesn't have syslog activated
+# Adapt if needed in the future
+SYSTEMD_PACKAGES_remove = "${PN}-syslog"
+INITSCRIPT_PACKAGES_remove = "${PN}-syslog"
+ALTERNATIVE_${PN}-syslog_remove = "syslog-conf"