summaryrefslogtreecommitdiff
path: root/sysvinit
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-03 21:21:40 +0000
committerChris Larson <clarson@kergoth.com>2004-12-03 21:21:40 +0000
commit2a08b60aff9d9bc2f84ac0e6249f29b31f9b0bd7 (patch)
tree71623c38fe9adcacc8113e396d4173cee156bd0a /sysvinit
parent83794ba00760024b581fca215962aa577d23b8d2 (diff)
Merge oe-devel@oe-devel.bkbits.net:packages
into odin.sc.ti.com:/home/kergoth/code/packages 2004/12/03 15:21:29-06:00 ti.com!kergoth Update the PACKAGE_ARCH bits to suck a bit less. BKrev: 41b0d8e4rsL0NS7oeNg9h5Mf9Y9g4A
Diffstat (limited to 'sysvinit')
-rw-r--r--sysvinit/sysvinit_2.85.oe8
-rw-r--r--sysvinit/sysvinit_2.86.oe8
2 files changed, 6 insertions, 10 deletions
diff --git a/sysvinit/sysvinit_2.85.oe b/sysvinit/sysvinit_2.85.oe
index b1c2c01cc0..149e186537 100644
--- a/sysvinit/sysvinit_2.85.oe
+++ b/sysvinit/sysvinit_2.85.oe
@@ -10,11 +10,9 @@ FILES_${PN} = "/sbin ${bindir} ${sysconfdir}"
FILES_sysv-rc = "${sbindir}"
PR = "r1"
-python () {
- mach = oe.data.getVar('MACHINE', d, 1)
- if mach:
- oe.data.setVar('PACKAGE_ARCH', oe.data.getVar('MACHINE_ARCH', d, 1), d)
-}
+# USE_VT and SERIAL_CONSLE are generally defined by the MACHINE .conf.
+# Set PACKAGE_ARCH appropriately.
+PACKAGE_ARCH := "${MACHINE_ARCH}"
USE_VT ?= "1"
diff --git a/sysvinit/sysvinit_2.86.oe b/sysvinit/sysvinit_2.86.oe
index da081f401b..4c698c7aa5 100644
--- a/sysvinit/sysvinit_2.86.oe
+++ b/sysvinit/sysvinit_2.86.oe
@@ -7,11 +7,9 @@ HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
FILES_${PN} += "/sbin /bin"
PR = "r0"
-python () {
- mach = oe.data.getVar('MACHINE', d, 1)
- if mach:
- oe.data.setVar('PACKAGE_ARCH', oe.data.getVar('MACHINE_ARCH', d, 1), d)
-}
+# USE_VT and SERIAL_CONSLE are generally defined by the MACHINE .conf.
+# Set PACKAGE_ARCH appropriately.
+PACKAGE_ARCH := "${MACHINE_ARCH}"
USE_VT ?= "1"