* [gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/portage/env/, tools-uclibc/desktop/, ...
@ 2014-01-24 18:09 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2014-01-24 18:09 UTC (permalink / raw
To: gentoo-commits
commit: 3d4d415a27d8d11de167f48ad675b6d843d7d023
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 18:08:07 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 18:09:11 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=3d4d415a
tools-uclibc/desktop: update build for uclibc desktop (lilblue)
---
tools-uclibc/desktop/portage/env/cmake.conf | 2 ++
tools-uclibc/desktop/portage/env/mplayer2.conf | 1 +
tools-uclibc/desktop/portage/env/pinentry.conf | 3 ++-
tools-uclibc/desktop/portage/env/slim.conf | 2 ++
tools-uclibc/desktop/portage/env/xanim.conf | 2 ++
tools-uclibc/desktop/portage/env/xdg-user-dirs.conf | 1 +
tools-uclibc/desktop/portage/package.env | 5 +++++
tools-uclibc/desktop/rebuild.sh | 2 +-
tools-uclibc/desktop/run.sh | 2 ++
tools-uclibc/desktop/toolchain.sh | 6 +++++-
tools-uclibc/desktop/update.sh | 11 ++++++++---
11 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/tools-uclibc/desktop/portage/env/cmake.conf b/tools-uclibc/desktop/portage/env/cmake.conf
new file mode 100644
index 0000000..08f1d68
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/cmake.conf
@@ -0,0 +1,2 @@
+#this should go upstream
+LDFLAGS="-lpthread"
diff --git a/tools-uclibc/desktop/portage/env/mplayer2.conf b/tools-uclibc/desktop/portage/env/mplayer2.conf
new file mode 100644
index 0000000..51d9d82
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/mplayer2.conf
@@ -0,0 +1 @@
+LDFLAGS="-lintl"
diff --git a/tools-uclibc/desktop/portage/env/pinentry.conf b/tools-uclibc/desktop/portage/env/pinentry.conf
index 518a258..a97e239 100644
--- a/tools-uclibc/desktop/portage/env/pinentry.conf
+++ b/tools-uclibc/desktop/portage/env/pinentry.conf
@@ -1 +1,2 @@
-CFLAGS="-liconv"
+#this should go upstream
+LDFLAGS="-liconv -lpthread"
diff --git a/tools-uclibc/desktop/portage/env/slim.conf b/tools-uclibc/desktop/portage/env/slim.conf
new file mode 100644
index 0000000..08f1d68
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/slim.conf
@@ -0,0 +1,2 @@
+#this should go upstream
+LDFLAGS="-lpthread"
diff --git a/tools-uclibc/desktop/portage/env/xanim.conf b/tools-uclibc/desktop/portage/env/xanim.conf
new file mode 100644
index 0000000..68f559e
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/xanim.conf
@@ -0,0 +1,2 @@
+#This needs to be fixed in the tree
+LDFLAGS="-ldl"
diff --git a/tools-uclibc/desktop/portage/env/xdg-user-dirs.conf b/tools-uclibc/desktop/portage/env/xdg-user-dirs.conf
new file mode 100644
index 0000000..247baf2
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/xdg-user-dirs.conf
@@ -0,0 +1 @@
+LDFLAGS="-liconv -lpthread"
diff --git a/tools-uclibc/desktop/portage/package.env b/tools-uclibc/desktop/portage/package.env
index fa23f55..f5d3142 100644
--- a/tools-uclibc/desktop/portage/package.env
+++ b/tools-uclibc/desktop/portage/package.env
@@ -1,10 +1,15 @@
app-crypt/pinentry pinentry.conf
dev-libs/pakchois pakchois.conf
dev-python/pygobject pygobject.conf
+dev-util/cmake cmake.conf
dev-vcs/git git.conf
media-gfx/fontforge fontforge.conf
media-libs/libquicktime libquicktime.conf
media-video/ffmpeg ffmpeg.conf
+media-video/mplayer2 mplayer2.conf
+media-video/xanim xanim.conf
net-print/cups-filters cups-filters.conf
sys-apps/coreutils coreutils.conf
x11-libs/gdk-pixbuf gdk-pixbuf.conf
+x11-misc/slim slim.conf
+x11-misc/xdg-user-dirs xdg-user-dirs.conf
diff --git a/tools-uclibc/desktop/rebuild.sh b/tools-uclibc/desktop/rebuild.sh
index c22e006..20d52bd 100755
--- a/tools-uclibc/desktop/rebuild.sh
+++ b/tools-uclibc/desktop/rebuild.sh
@@ -2,4 +2,4 @@
source /etc/profile
env-update
-emerge --keep-going -evq world
+emerge -evq --keep-going --with-bdeps=y world
diff --git a/tools-uclibc/desktop/run.sh b/tools-uclibc/desktop/run.sh
index 6cc99fa..7fd2b4b 100755
--- a/tools-uclibc/desktop/run.sh
+++ b/tools-uclibc/desktop/run.sh
@@ -19,6 +19,7 @@ mount_dirs() {
mount --bind /proc/ "${ROOTFS}"/proc/
mount --bind /dev/ "${ROOTFS}"/dev/
mount --bind /dev/pts "${ROOTFS}"/dev/pts/
+ mount -t tmpfs shm "${ROOTFS}"/dev/shm
mount --bind /sys/ "${ROOTFS}"/sys/
}
@@ -156,6 +157,7 @@ cleanup_dirs() {
unmount_dirs() {
umount "${ROOTFS}"/sys/
+ umount "${ROOTFS}"/dev/shm
umount "${ROOTFS}"/dev/pts/
umount "${ROOTFS}"/dev/
umount "${ROOTFS}"/proc/
diff --git a/tools-uclibc/desktop/toolchain.sh b/tools-uclibc/desktop/toolchain.sh
index 0458679..01e406e 100755
--- a/tools-uclibc/desktop/toolchain.sh
+++ b/tools-uclibc/desktop/toolchain.sh
@@ -2,6 +2,10 @@
source /etc/profile
env-update
+emerge -1q binutils
+source /etc/profile
+env-update
emerge -1q gcc
+source /etc/profile
+env-update
emerge -1q uclibc
-emerge -1q binutils
diff --git a/tools-uclibc/desktop/update.sh b/tools-uclibc/desktop/update.sh
index 434d47f..56f2e50 100755
--- a/tools-uclibc/desktop/update.sh
+++ b/tools-uclibc/desktop/update.sh
@@ -1,8 +1,13 @@
#!/bin/bash -l
+#hacky - for some reason cairo fails to rebuild
+#unless binutils is rebuilt first. It fails to
+#find libibirty.
source /etc/profile
env-update
-#hacky - for some reason cairo fails to rebuild
-#unless binutils is rebuilt first.
emerge -q binutils
-emerge -uvNDq world
+source /etc/profile
+env-update
+emerge -1q x11-libs/cairo
+
+emerge -uvNDq --keep-going --with-bdeps=y world
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/portage/env/, tools-uclibc/desktop/, ...
@ 2014-09-27 7:52 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2014-09-27 7:52 UTC (permalink / raw
To: gentoo-commits
commit: e21e1400690c5582e6a581eaa4a78a35b303dc57
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 07:52:35 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 07:52:35 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=e21e1400
tools-uclibc/desktop: remove pulseaudio from amd64 uclibc desktop
---
tools-uclibc/desktop/config | 3 ++-
tools-uclibc/desktop/portage/env/pulseaudio.conf | 1 -
tools-uclibc/desktop/portage/make.conf.2 | 2 +-
tools-uclibc/desktop/portage/make.conf.3 | 2 +-
tools-uclibc/desktop/portage/package.env | 1 -
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/tools-uclibc/desktop/config b/tools-uclibc/desktop/config
index 705bbb2..6810fdb 100644
--- a/tools-uclibc/desktop/config
+++ b/tools-uclibc/desktop/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.16.2-hardened-r2 Kernel Configuration
+# Linux/x86 3.16.3-hardened Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -4476,6 +4476,7 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
#
# Media ancillary drivers (tuners, sensors, i2c, frontends)
diff --git a/tools-uclibc/desktop/portage/env/pulseaudio.conf b/tools-uclibc/desktop/portage/env/pulseaudio.conf
deleted file mode 100644
index be0ccc4..0000000
--- a/tools-uclibc/desktop/portage/env/pulseaudio.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-lintl"
diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2
index 78472e4..0768eb4 100644
--- a/tools-uclibc/desktop/portage/make.conf.2
+++ b/tools-uclibc/desktop/portage/make.conf.2
@@ -21,7 +21,7 @@ USE_AUDIO="openal"
USE_IMG="aalib apng exif gif jpeg jpeg2k lcms mng png svg tiff xmp"
USE_GRAPH="gbm opengl xcb"
USE_DISPLAY="cairo xinerama xscreensaver"
-USE_MULTI="3dnow 3dnowext a52 aac alsa amr ass avx cdio dirac dga dts dv dvb dvd encode ffmpeg flac g3dvl gsm jack jpeg2k lame libass libv4l mad mmxext mod modplug mp3 mpeg musepack ogg oss pulseaudio quicktime rtmp schroedinger sdl sdlgfx speex taglib theora vcd vorbis vpx xv xvid xvmc v4l vaapi"
+USE_MULTI="3dnow 3dnowext a52 aac alsa amr ass avx cdio dirac dga dts dv dvb dvd encode ffmpeg flac g3dvl gsm jack jpeg2k lame libass libv4l mad mmxext mod modplug mp3 mpeg musepack ogg oss quicktime rtmp schroedinger sdl sdlgfx speex taglib theora vcd vorbis vpx xv xvid xvmc v4l vaapi"
USE_MPLAYER="bidi bl bluray bs2b cddb cdparanoia cpudetection fbcon ftp ggi joystick ladspa libcaca libmpeg2 libnotify md5sum musicbrainz nas nut pnm portaudio postproc pvr quvi radio samba tga xanim zoran"
USE_BROWSE="curl webkit -libproxy"
diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3
index 65eea07..6cd5652 100644
--- a/tools-uclibc/desktop/portage/make.conf.3
+++ b/tools-uclibc/desktop/portage/make.conf.3
@@ -21,7 +21,7 @@ USE_AUDIO="openal"
USE_IMG="aalib apng exif gif jpeg jpeg2k lcms mng png svg tiff xmp"
USE_GRAPH="directfb gbm opengl xcb"
USE_DISPLAY="cairo xinerama xscreensaver"
-USE_MULTI="3dnow 3dnowext a52 aac alsa amr ass avx cdio dirac dga dts dv dvb dvd encode ffmpeg flac g3dvl gsm jack jpeg2k lame libass libv4l mad mmxext mod modplug mp3 mpeg musepack ogg oss pulseaudio quicktime rtmp schroedinger sdl sdlgfx speex taglib theora vcd vorbis vpx xv xvid xvmc v4l vaapi"
+USE_MULTI="3dnow 3dnowext a52 aac alsa amr ass avx cdio dirac dga dts dv dvb dvd encode ffmpeg flac g3dvl gsm jack jpeg2k lame libass libv4l mad mmxext mod modplug mp3 mpeg musepack ogg oss quicktime rtmp schroedinger sdl sdlgfx speex taglib theora vcd vorbis vpx xv xvid xvmc v4l vaapi"
USE_MPLAYER="bidi bl bluray bs2b cddb cdparanoia cpudetection fbcon ftp ggi joystick ladspa libcaca libmpeg2 libnotify md5sum musicbrainz nas nut pnm portaudio postproc pvr quvi radio samba tga xanim zoran"
USE_BROWSE="curl webkit -libproxy"
diff --git a/tools-uclibc/desktop/portage/package.env b/tools-uclibc/desktop/portage/package.env
index 87cb7bd..03eec81 100644
--- a/tools-uclibc/desktop/portage/package.env
+++ b/tools-uclibc/desktop/portage/package.env
@@ -8,7 +8,6 @@ dev-vcs/git git.conf
gnome-base/gnome-desktop gnome-desktop.conf
media-gfx/fontforge fontforge.conf
media-libs/libquicktime libquicktime.conf
-media-sound/pulseaudio pulseaudio.conf
media-video/ffmpeg ffmpeg.conf
media-video/libav libav.conf
media-video/mplayer2 mplayer2.conf
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/portage/env/, tools-uclibc/desktop/, ...
@ 2015-05-09 1:29 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2015-05-09 1:29 UTC (permalink / raw
To: gentoo-commits
commit: d0af5edf0001c37cf7241125d4394ebc322cdf62
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed May 6 11:50:28 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May 9 01:29:11 2015 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d0af5edf
tools-uclibc/desktop: correct PAX_MARKINGS, add screen and bind-tools.
tools-uclibc/desktop/portage/env/bind-tools.conf | 1 +
tools-uclibc/desktop/portage/make.conf.1 | 1 +
tools-uclibc/desktop/portage/make.conf.2 | 1 +
tools-uclibc/desktop/portage/make.conf.3 | 1 +
tools-uclibc/desktop/portage/package.env | 1 +
tools-uclibc/desktop/run.sh | 15 ++++++++++++---
tools-uclibc/desktop/world.1 | 2 ++
tools-uclibc/desktop/world.2 | 2 ++
8 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/tools-uclibc/desktop/portage/env/bind-tools.conf b/tools-uclibc/desktop/portage/env/bind-tools.conf
new file mode 100644
index 0000000..50fcbfb
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/bind-tools.conf
@@ -0,0 +1 @@
+LDFLAGS="-liconv"
diff --git a/tools-uclibc/desktop/portage/make.conf.1 b/tools-uclibc/desktop/portage/make.conf.1
index 0edd2e0..9058d76 100644
--- a/tools-uclibc/desktop/portage/make.conf.1
+++ b/tools-uclibc/desktop/portage/make.conf.1
@@ -2,6 +2,7 @@ CFLAGS="-O2 -fstack-check -pipe"
CXXFLAGS="${CFLAGS}"
CHOST="x86_64-gentoo-linux-uclibc"
MAKEOPTS="-j17"
+PAX_MARKINGS="XT"
USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig"
USE_GCC="graphite objc objc++ objc-gc gtk gtk3 X"
diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2
index de495be..7d55750 100644
--- a/tools-uclibc/desktop/portage/make.conf.2
+++ b/tools-uclibc/desktop/portage/make.conf.2
@@ -2,6 +2,7 @@ CFLAGS="-fstack-check -O2 -pipe"
CXXFLAGS="${CFLAGS}"
CHOST="x86_64-gentoo-linux-uclibc"
MAKEOPTS="-j17"
+PAX_MARKINGS="XT"
USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig"
USE_GCC="graphite objc objc++ objc-gc gtk gtk3 qt4 X"
diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3
index 4d5dc2b..eca601c 100644
--- a/tools-uclibc/desktop/portage/make.conf.3
+++ b/tools-uclibc/desktop/portage/make.conf.3
@@ -2,6 +2,7 @@ CFLAGS="-fstack-check -O2 -pipe"
CXXFLAGS="${CFLAGS}"
CHOST="x86_64-gentoo-linux-uclibc"
MAKEOPTS="-j17"
+PAX_MARKINGS="XT"
USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig"
USE_GCC="graphite objc objc++ objc-gc gtk gtk3 qt4 X"
diff --git a/tools-uclibc/desktop/portage/package.env b/tools-uclibc/desktop/portage/package.env
index fecaba8..4fdd279 100644
--- a/tools-uclibc/desktop/portage/package.env
+++ b/tools-uclibc/desktop/portage/package.env
@@ -12,6 +12,7 @@ media-video/ffmpeg ffmpeg.conf
media-video/libav libav.conf
media-video/mplayer2 mplayer2.conf
media-video/xanim xanim.conf
+net-dns/bind-tools bind-tools.conf
net-mail/dovecot dovecot.conf
net-print/cups-filters cups-filters.conf
sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/desktop/run.sh b/tools-uclibc/desktop/run.sh
index 0bf6986..d365508 100755
--- a/tools-uclibc/desktop/run.sh
+++ b/tools-uclibc/desktop/run.sh
@@ -135,6 +135,11 @@ setup_usergroups() {
setup_confs() {
local IMAGE="http://dev.gentoo.org/~blueness/lilblue/gentoo1600x1200.jpg"
+ # Clean up /etc/portage.
+ sed -i '/^GENTOO_MIRRORS/d' "${ROOTFS}"/etc/portage/make.conf
+ sed -i 's/^MAKEOPTS/#MAKEOPTS/' "${ROOTFS}"/etc/portage/make.conf
+
+ # Change the display greeter to slim and configure.
sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1slim/' "${ROOTFS}"/etc/conf.d/xdm
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
@@ -144,11 +149,15 @@ setup_confs() {
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 '/^GENTOO_MIRRORS/d' "${ROOTFS}"/etc/portage/make.conf
- sed -i 's/^MAKEOPTS/#MAKEOPTS/' "${ROOTFS}"/etc/portage/make.conf
+ # Change the hostname to 'lilblue'.
+ sed -i 's/localhost/lilblue/' "${ROOTFS}"/etc/conf.d/hostname
- # In kernels 3.9 and above, we must disallow-other-stacks because of SO_REUSEPORT
+ # In kernels 3.9 and above, we must disallow-other-stacks because of SO_REUSEPORT.
sed -i 's/^#\(disallow-other-stacks=\)no/\1yes/g' "${ROOTFS}"/etc/avahi/avahi-daemon.conf
+
+ # Since we're using an ubuntu-based config, get rid of the evdev spam in dmesg.
+ # https://bugs.launchpad.net/ubuntu/+source/module-init-tools/+bug/240553
+ echo "blacklist evbug" >> "${ROOTFS}"/etc/modprobe.d/blacklist.conf
}
cleanup_dirs() {
diff --git a/tools-uclibc/desktop/world.1 b/tools-uclibc/desktop/world.1
index 96ecc42..8631b70 100644
--- a/tools-uclibc/desktop/world.1
+++ b/tools-uclibc/desktop/world.1
@@ -4,6 +4,7 @@ app-arch/file-roller
app-editors/gedit
app-editors/nano
app-editors/vim
+app-misc/screen
app-office/abiword
app-portage/gentoolkit
app-portage/layman
@@ -27,6 +28,7 @@ media-video/smplayer
media-video/totem
net-analyzer/tcpdump
net-dns/avahi
+net-dns/bind-tools
net-fs/samba
net-ftp/lftp
net-irc/hexchat
diff --git a/tools-uclibc/desktop/world.2 b/tools-uclibc/desktop/world.2
index 97076c4..8232e97 100644
--- a/tools-uclibc/desktop/world.2
+++ b/tools-uclibc/desktop/world.2
@@ -4,6 +4,7 @@ app-arch/file-roller
app-editors/gedit
app-editors/nano
app-editors/vim
+app-misc/screen
app-office/abiword
app-office/gnumeric
app-portage/gentoolkit
@@ -28,6 +29,7 @@ media-video/smplayer
media-video/totem
net-analyzer/tcpdump
net-dns/avahi
+net-dns/bind-tools
net-fs/samba
net-ftp/lftp
net-irc/hexchat
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-09 1:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-27 7:52 [gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/portage/env/, tools-uclibc/desktop/, Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2015-05-09 1:29 Anthony G. Basile
2014-01-24 18:09 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox