gnomeos: sysvinit actually runs inside the chroot
This commit is contained in:
1 parent
97e82447c6
commit
701ba596e4
4 files changed
+20
-5
No files matched your search
@@ -10,7 +10,7 @@ inherit rootfs_${IMAGE_PKGTYPE}
|
||||
PACKAGE_INSTALL = "task-core-boot task-base-extended \
|
||||
ostree ostree-init"
|
||||
RDEPENDS += "${PACKAGE_INSTALL}"
|
||||
DEPENDS += "virtual/fakeroot-native"
|
||||
DEPENDS += "makedevs-native virtual/fakeroot-native"
|
||||
|
||||
EXCLUDE_FROM_WORLD = "1"
|
||||
|
||||
@@ -20,6 +20,9 @@ do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
|
||||
do_build[nostamp] = "1"
|
||||
do_rootfs[umask] = 022
|
||||
|
||||
def gnomeos_get_devtable_list(d):
|
||||
return bb.which(d.getVar('BBPATH', 1), 'files/device_table-minimal.txt')
|
||||
|
||||
# Must call real_do_rootfs() from inside here, rather than as a separate
|
||||
# task, so that we have a single fakeroot context for the whole process.
|
||||
fakeroot do_rootfs () {
|
||||
@@ -31,6 +34,8 @@ fakeroot do_rootfs () {
|
||||
|
||||
rootfs_${IMAGE_PKGTYPE}_do_rootfs
|
||||
|
||||
makedevs -r ${IMAGE_ROOTFS} -D ${@gnomeos_get_devtable_list(d)}
|
||||
|
||||
echo "GNOME OS Unix login" > ${IMAGE_ROOTFS}/etc/issue
|
||||
|
||||
TOPROOT_BIND_MOUNTS="home root tmp"
|
||||
@@ -48,6 +53,8 @@ fakeroot do_rootfs () {
|
||||
for d in $READONLY_BIND_MOUNTS; do
|
||||
mv ${IMAGE_ROOTFS}/$d .
|
||||
done
|
||||
# Also copy over any static /dev contents for now
|
||||
mv ${IMAGE_ROOTFS}/dev .
|
||||
rm -rf ${IMAGE_ROOTFS}
|
||||
mv ${WORKDIR}/gnomeos-contents ${IMAGE_ROOTFS}
|
||||
|
||||
|
||||
Reference in new issue
Block a user