diff options
Diffstat (limited to 'poky/meta-poky')
| -rw-r--r-- | poky/meta-poky/conf/local.conf.sample | 4 | ||||
| -rw-r--r-- | poky/meta-poky/recipes-core/tiny-init/tiny-init.bb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index 9068e567d..59b4d9561 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -34,8 +34,8 @@ #MACHINE ?= "mpc8315e-rdb" #MACHINE ?= "edgerouter" # -# This sets the default machine to be qemux86 if no other machine is selected: -MACHINE ??= "qemux86" +# This sets the default machine to be qemux86-64 if no other machine is selected: +MACHINE ??= "qemux86-64" # # Where to place downloads diff --git a/poky/meta-poky/recipes-core/tiny-init/tiny-init.bb b/poky/meta-poky/recipes-core/tiny-init/tiny-init.bb index 4d4e34dc8..44c8e1bf5 100644 --- a/poky/meta-poky/recipes-core/tiny-init/tiny-init.bb +++ b/poky/meta-poky/recipes-core/tiny-init/tiny-init.bb @@ -28,3 +28,4 @@ do_install() { } FILES_${PN} = "/init ${sysconfdir}/rc.local.sample" +RCONFLICTS_${PN} = "systemd" |