tools-uclibc/desktop: update build after gnome3 stabilization
This commit is contained in:
parent
a3fc2f1c06
commit
db07ce1ab3
1
tools-uclibc/.gitignore
vendored
1
tools-uclibc/.gitignore
vendored
|
@ -1,3 +1,2 @@
|
||||||
*log
|
*log
|
||||||
*conf
|
|
||||||
*err
|
*err
|
||||||
|
|
1
tools-uclibc/desktop/.gitignore
vendored
1
tools-uclibc/desktop/.gitignore
vendored
|
@ -1,2 +1 @@
|
||||||
desktop-amd64-uclibc-hardened*
|
desktop-amd64-uclibc-hardened*
|
||||||
*log
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,6 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Exec=abiword-2.8
|
Exec=abiword %U
|
||||||
Icon=abiword_48
|
Icon=abiword
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
|
Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
|
||||||
|
|
1
tools-uclibc/desktop/portage/env/pakchois.conf
vendored
Normal file
1
tools-uclibc/desktop/portage/env/pakchois.conf
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
CFLAGS="-lintl"
|
|
@ -1,4 +1,5 @@
|
||||||
app-crypt/pinentry pinentry.conf
|
app-crypt/pinentry pinentry.conf
|
||||||
|
dev-libs/pakchois pakchois.conf
|
||||||
dev-python/pygobject pygobject.conf
|
dev-python/pygobject pygobject.conf
|
||||||
dev-vcs/git git.conf
|
dev-vcs/git git.conf
|
||||||
media-gfx/fontforge fontforge.conf
|
media-gfx/fontforge fontforge.conf
|
||||||
|
|
1
tools-uclibc/desktop/portage/package.mask/epiphany
Normal file
1
tools-uclibc/desktop/portage/package.mask/epiphany
Normal file
|
@ -0,0 +1 @@
|
||||||
|
>www-client/epiphany-2.30.6-r1
|
|
@ -0,0 +1 @@
|
||||||
|
>gnome-extra/gnome-screensaver-2.30.2-r1
|
1
tools-uclibc/desktop/portage/package.mask/slim
Normal file
1
tools-uclibc/desktop/portage/package.mask/slim
Normal file
|
@ -0,0 +1 @@
|
||||||
|
>x11-misc/slim-1.3.5-r4
|
1
tools-uclibc/desktop/portage/package.mask/webkit-gtk
Normal file
1
tools-uclibc/desktop/portage/package.mask/webkit-gtk
Normal file
|
@ -0,0 +1 @@
|
||||||
|
>net-libs/webkit-gtk-1.8.3-r300
|
|
@ -103,30 +103,41 @@ setup_initrc() {
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_usergroups() {
|
setup_usergroups() {
|
||||||
|
local DCONF_LOCAL="http://dev.gentoo.org/~blueness/lilblue/user"
|
||||||
|
|
||||||
cp -f passwd.sh "${ROOTFS}"/tmp/
|
cp -f passwd.sh "${ROOTFS}"/tmp/
|
||||||
chroot "${ROOTFS}"/ /tmp/passwd.sh
|
chroot "${ROOTFS}"/ /tmp/passwd.sh
|
||||||
rm -f "${ROOTFS}"/tmp/passwd.sh
|
rm -f "${ROOTFS}"/tmp/passwd.sh
|
||||||
|
|
||||||
rm -rf "${ROOTFS}"/etc/skel
|
rm -rf "${ROOTFS}"/etc/skel
|
||||||
cp -a gentoo "${ROOTFS}"/etc/skel
|
cp -a gentoo "${ROOTFS}"/etc/skel
|
||||||
mkdir "${ROOTFS}"/etc/skel/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos,.ssh}
|
mkdir -p "${ROOTFS}"/etc/skel/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos,.ssh,.cache/dconf,.config/dconf}
|
||||||
chmod 700 "${ROOTFS}"/etc/skel/.ssh
|
chmod 700 "${ROOTFS}"/etc/skel/.ssh
|
||||||
|
wget -O "${ROOTFS}"/etc/skel/.config/dconf/user "${DCONF_LOCAL}"
|
||||||
|
wget -O "${ROOTFS}"/etc/skel/.cache/dconf/user "${DCONF_LOCAL}"
|
||||||
|
|
||||||
rm -rf "${ROOTFS}"/home/gentoo
|
rm -rf "${ROOTFS}"/home/gentoo
|
||||||
cp -a gentoo "${ROOTFS}"/home/gentoo
|
cp -a gentoo "${ROOTFS}"/home/gentoo
|
||||||
mkdir "${ROOTFS}"/home/gentoo/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos,.ssh}
|
mkdir -p "${ROOTFS}"/home/gentoo/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos,.ssh,.cache/dconf,.config/dconf}
|
||||||
chmod 700 "${ROOTFS}"/home/gentoo/.ssh
|
chmod 700 "${ROOTFS}"/home/gentoo/.ssh
|
||||||
|
wget -O "${ROOTFS}"/home/gentoo/.config/dconf/user "${DCONF_LOCAL}"
|
||||||
|
wget -O "${ROOTFS}"/home/gentoo/.cache/dconf/user "${DCONF_LOCAL}"
|
||||||
|
|
||||||
chroot "${ROOTFS}"/ chown -R gentoo:gentoo /home/gentoo
|
chroot "${ROOTFS}"/ chown -R gentoo:gentoo /home/gentoo
|
||||||
sed -i 's/# \(%wheel.*NOPASSWD\)/\1/' "${ROOTFS}"/etc/sudoers
|
sed -i 's/# \(%wheel.*NOPASSWD\)/\1/' "${ROOTFS}"/etc/sudoers
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_confs() {
|
setup_confs() {
|
||||||
|
local IMAGE="http://dev.gentoo.org/~blueness/lilblue/gentoo1600x1200.jpg"
|
||||||
|
|
||||||
sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1slim/' "${ROOTFS}"/etc/conf.d/xdm
|
sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1slim/' "${ROOTFS}"/etc/conf.d/xdm
|
||||||
sed -i 's/^\(login.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
|
sed -i 's/^\(login.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
|
||||||
sed -i '/# login_cmd.*Xsession/ a\login_cmd exec /bin/bash -login ~/.xinitrc' "${ROOTFS}"/etc/slim.conf
|
sed -i '/# login_cmd.*Xsession/ a\login_cmd exec /bin/bash -login ~/.xinitrc' "${ROOTFS}"/etc/slim.conf
|
||||||
wget -O "${ROOTFS}"/usr/share/slim/themes/default/background.jpg http://www.gentoo.org/images/backgrounds/gentoo1600x1200.jpg
|
#sed -i 's/^\(sessiondir.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
|
||||||
wget -O "${ROOTFS}"/usr/share/pixmaps/backgrounds/gnome/background-default.jpg http://www.gentoo.org/images/backgrounds/gentoo1600x1200.jpg
|
#sed -i '/# sessiondir.*/ a\sessiondir /etc/X11/Sessions' "${ROOTFS}"/etc/slim.conf
|
||||||
|
|
||||||
|
wget -O "${ROOTFS}"/usr/share/slim/themes/default/background.jpg "${IMAGE}"
|
||||||
|
wget -O "${ROOTFS}"/usr/share/pixmaps/backgrounds/gnome/background-default.jpg "${IMAGE}"
|
||||||
|
|
||||||
sed -i '/^SYNC/d' "${ROOTFS}"/etc/portage/make.conf
|
sed -i '/^SYNC/d' "${ROOTFS}"/etc/portage/make.conf
|
||||||
sed -i '/^GENTOO_MIRRORS/d' "${ROOTFS}"/etc/portage/make.conf
|
sed -i '/^GENTOO_MIRRORS/d' "${ROOTFS}"/etc/portage/make.conf
|
||||||
|
|
Loading…
Reference in a new issue