VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

gnome: baselayout-2 Fixes

This commit is contained in:
Albert Hopkins 2011-05-12 10:35:06 -04:00
parent bb3d3f77ac
commit 111ea2c4e5
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnome/Makefile
View File

@ -1,8 +1,4 @@
ifneq ($(OVERLAY),YES)
DO_OVERLAY = \#
endif
# totem gst-inspect requires a machine id (generated by dbus). we # totem gst-inspect requires a machine id (generated by dbus). we
# don't have one yet because we are in a virgin chroot. fake one # don't have one yet because we are in a virgin chroot. fake one
preinstall: preinstall:
@ -10,19 +6,20 @@ preinstall:
echo 1234567890abcdef1234567890abcdef > \ echo 1234567890abcdef1234567890abcdef > \
"$(CHROOT)"/var/lib/dbus/machine-id "$(CHROOT)"/var/lib/dbus/machine-id
chroot "$(CHROOT)" $(EMERGE) $(USEPKG) -1n dev-util/pkgconfig chroot "$(CHROOT)" $(EMERGE) $(USEPKG) -1n dev-util/pkgconfig
$(DO_OVERLAY) chroot $(CHROOT) $(EMERGE) $(USEPKG) -1n app-portage/layman ifeq ($(OVERLAY),YES)
$(DO_OVERLAY) chroot $(CHROOT) $(EMERGE) $(USEPKG) -1n dev-vcs/git chroot $(CHROOT) $(EMERGE) $(USEPKG) -1n app-portage/layman
$(DO_OVERLAY) chroot $(CHROOT) /usr/bin/layman --sync ALL chroot $(CHROOT) $(EMERGE) $(USEPKG) -1n dev-vcs/git
$(DO_OVERLAY) chroot $(CHROOT) /usr/bin/layman --add gnome chroot $(CHROOT) /usr/bin/layman --sync ALL
$(DO_OVERLAY) echo "source /var/lib/layman/make.conf" >> $(CHROOT)/etc/make.conf chroot $(CHROOT) /usr/bin/layman --add gnome
$(DO_OVERLAY) echo USE='"$$USE clutter"' >> $(CHROOT)/etc/make.conf echo "source /var/lib/layman/make.conf" >> $(CHROOT)/etc/make.conf
echo USE='"$$USE clutter"' >> $(CHROOT)/etc/make.conf
endif
postinstall: custom.conf postinstall: custom.conf gdm.start
$(RM) "$(CHROOT)"/var/lib/dbus/machine-id $(RM) "$(CHROOT)"/var/lib/dbus/machine-id
cp custom.conf "$(CHROOT)"/etc/X11/gdm/custom.conf cp custom.conf "$(CHROOT)"/etc/X11/gdm/custom.conf
#chroot "$(CHROOT)" rc-update add hald default ln -sf /etc/init.d/dbus "$(CHROOT)/etc/runlevels/default/dbus"
chroot "$(CHROOT)" rc-update add dbus default cp gdm.start "$(CHROOT)/etc/local.d/gdm.start"
echo 'gdm &>/dev/null' >> "$(CHROOT)"/etc/conf.d/local.start
clean: clean: