packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnomeos: Some tweaks to image content

This commit is contained in:
Colin Walters 2011-11-16 21:47:56 -05:00
parent 9fb390664a
commit 53191e4c8e
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnomeos/yocto/gnomeos-run.sh
View File

@ -89,4 +89,4 @@ if ! echo $ARGS | grep -q 'ostree='; then
ARGS="ostree=current $ARGS" ARGS="ostree=current $ARGS"
fi fi
exec qemu-kvm -kernel ./tmp/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -append "$ARGS" exec qemu-kvm -kernel ./tmp-eglibc/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -append "$ARGS"

13
gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb
View File

@ -7,8 +7,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
inherit rootfs_${IMAGE_PKGTYPE} inherit rootfs_${IMAGE_PKGTYPE}
PACKAGE_INSTALL = "task-core-boot task-base-extended \ PACKAGE_INSTALL = "task-core-boot \
ostree ostree-init strace" coreutils \
ostree ostree-init \
strace"
RDEPENDS += "${PACKAGE_INSTALL}" RDEPENDS += "${PACKAGE_INSTALL}"
DEPENDS += "makedevs-native virtual/fakeroot-native" DEPENDS += "makedevs-native virtual/fakeroot-native"
@ -34,9 +37,6 @@ fakeroot do_rootfs () {
rootfs_${IMAGE_PKGTYPE}_do_rootfs rootfs_${IMAGE_PKGTYPE}_do_rootfs
makedevs -r ${IMAGE_ROOTFS} -D ${@gnomeos_get_devtable_list(d)}
mkdir ${IMAGE_ROOTFS}/dev/pts
# We use devtmpfs # We use devtmpfs
rm -f ${IMAGE_ROOTFS}/etc/init.d/udev-cache rm -f ${IMAGE_ROOTFS}/etc/init.d/udev-cache
rm -f ${IMAGE_ROOTFS}/etc/rc*.d/*udev-cache* rm -f ${IMAGE_ROOTFS}/etc/rc*.d/*udev-cache*
@ -49,7 +49,6 @@ sysfs /sys sysfs defaults 0 0
proc /proc proc defaults 0 0 proc /proc proc defaults 0 0
EOF EOF
echo "GNOME OS Unix login" > ${IMAGE_ROOTFS}/etc/issue
ln -sf /var/run/resolv.conf ${IMAGE_ROOTFS}/etc/resolv.conf ln -sf /var/run/resolv.conf ${IMAGE_ROOTFS}/etc/resolv.conf
@ -68,8 +67,6 @@ EOF
for d in $READONLY_BIND_MOUNTS; do for d in $READONLY_BIND_MOUNTS; do
mv ${IMAGE_ROOTFS}/$d . mv ${IMAGE_ROOTFS}/$d .
done done
# Also copy over any static /dev contents for now
mv ${IMAGE_ROOTFS}/dev .
rm -rf ${IMAGE_ROOTFS} rm -rf ${IMAGE_ROOTFS}
mv ${WORKDIR}/gnomeos-contents ${IMAGE_ROOTFS} mv ${WORKDIR}/gnomeos-contents ${IMAGE_ROOTFS}