* [gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/portage/profile/package.use.mask/, tools-uclibc/desktop/, ...
@ 2013-05-14 0:48 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2013-05-14 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 4c0ebb316bc28c13177b71cacf53b857fb071d98
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue May 14 00:48:30 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue May 14 00:48:30 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=4c0ebb31
tools-uclibc/desktop: expand supported graphics
---
tools-uclibc/desktop/build.sh | 19 +++++++++++++------
tools-uclibc/desktop/portage/make.conf.2 | 3 ++-
tools-uclibc/desktop/portage/make.conf.3 | 3 ++-
tools-uclibc/desktop/portage/package.mask/sqlite | 1 -
.../portage/profile/package.use.mask/gnumeric | 1 +
.../portage/profile/package.use.mask/goffice | 1 +
.../desktop/portage/profile/package.use.mask/lvm2 | 1 +
tools-uclibc/desktop/world | 1 -
8 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/tools-uclibc/desktop/build.sh b/tools-uclibc/desktop/build.sh
index e7d8b60..5162828 100755
--- a/tools-uclibc/desktop/build.sh
+++ b/tools-uclibc/desktop/build.sh
@@ -20,10 +20,10 @@ cp -f lilo.conf desktop-amd64-uclibc-hardened/etc/lilo.conf
rm -f desktop-amd64-uclibc-hardened/etc/portage/make.conf.catalyst
cp -f portage/make.conf.1 desktop-amd64-uclibc-hardened/etc/portage/make.conf
-for d in env package.accept_keywords package.mask package.use; do
- [[ "$(ls portage/${d})" != "" ]] && cp -f portage/${d}/* desktop-amd64-uclibc-hardened/etc/portage/${d}/
+for d in env package.accept_keywords package.mask package.use profile; do
+ [[ -a portage/"${d}" ]] && cp -af portage/${d} desktop-amd64-uclibc-hardened/etc/portage
done
-cp portage/package.env desktop-amd64-uclibc-hardened/etc/portage/
+cp -af portage/package.env desktop-amd64-uclibc-hardened/etc/portage
cp -f toolchain.sh desktop-amd64-uclibc-hardened/tmp/
chroot desktop-amd64-uclibc-hardened/ /tmp/toolchain.sh
@@ -42,6 +42,7 @@ cp -f update.sh desktop-amd64-uclibc-hardened/tmp/
chroot desktop-amd64-uclibc-hardened/ /tmp/update.sh
rm -f desktop-amd64-uclibc-hardened/tmp/update.sh
+mkdir -p desktop-amd64-uclibc-hardened/boot
genkernel \
--kernel-config=config \
@@ -49,11 +50,15 @@ genkernel \
--symlink \
--no-mountboot \
--kerneldir=/usr/src/linux-lilblue \
- --bootdir=/root/lilblue/desktop-amd64-uclibc-hardened/boot/ \
- --module-prefix=/root/lilblue/desktop-amd64-uclibc-hardened/ \
- --modprobedir=/root/lilblue/desktop-amd64-uclibc-hardened/etc/modprobe.d \
+ --bootdir=/root/releng/tools-uclibc/desktop/desktop-amd64-uclibc-hardened/boot/ \
+ --module-prefix=/root/releng/tools-uclibc/desktop/desktop-amd64-uclibc-hardened/ \
+ --modprobedir=/root/releng/tools-uclibc/desktop/desktop-amd64-uclibc-hardened/etc/modprobe.d \
all
+for i in $(find /root/releng/tools-uclibc/desktop/desktop-amd64-uclibc-hardened/lib/modules -iname *ko); do
+ objcopy --strip-unneeded $i
+done
+
ln -sf net.lo desktop-amd64-uclibc-hardened/etc/init.d/net.eth0
chroot desktop-amd64-uclibc-hardened/ rc-update add alsasound default
chroot desktop-amd64-uclibc-hardened/ rc-update add cupsd default
@@ -73,6 +78,8 @@ rm -f desktop-amd64-uclibc-hardened/tmp/passwd.sh
rm -rf desktop-amd64-uclibc-hardened/home/gentoo
cp -a gentoo desktop-amd64-uclibc-hardened/home/
+chroot desktop-amd64-uclibc-hardened/ chown -R gentoo:gentoo /home/gentoo
+sed -i 's/# \(%wheel.*NOPASSWD\)/\1/' desktop-amd64-uclibc-hardened/etc/sudoers
sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1slim/' desktop-amd64-uclibc-hardened/etc/conf.d/xdm
sed -i 's/^\(login.*\)/# \1/' desktop-amd64-uclibc-hardened/etc/slim.conf
diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2
index bf64b0c..4332bbe 100644
--- a/tools-uclibc/desktop/portage/make.conf.2
+++ b/tools-uclibc/desktop/portage/make.conf.2
@@ -34,7 +34,8 @@ USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-synt
USE="${USE_BASE} ${USE_GCC} ${USE_ENC} ${USE_ACL} ${USE_DBS} ${USE_CMP} ${USE_LANG} ${USE_UDEV} ${USE_VCS} ${USE_CHAR} ${USE_SERVERS} ${USE_PAX} ${USE_AUDIO} ${USE_IMG} ${USE_GRAPH} ${USE_DISPLAY} ${USE_MULTI} ${USE_MPLAYER} ${USE_BROWSE} ${USE_WORD} ${USE_GAMES} ${USE_XFCE4} ${USE_MISC}"
XFCE_PLUGINS="trash menu logout"
-VIDEO_CARDS="fbdev nouveau radeon"
+INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard mouse mutouch penmount tslib void"
+VIDEO_CARDS="apm ark ast chips cirrus epson fbdev glint i128 i740 intel mach64 mga modesetting nouveau nv r128 radeon rendition s3 s3virge savage siliconmotion sis sisusb tdfx tga trident tseng v4l vesa"
LINGUAS="en"
PORTDIR_OVERLAY="/var/lib/layman/hardened-development"
diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3
index 0fd4ae5..6873c92 100644
--- a/tools-uclibc/desktop/portage/make.conf.3
+++ b/tools-uclibc/desktop/portage/make.conf.3
@@ -34,7 +34,8 @@ USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-synt
USE="${USE_BASE} ${USE_GCC} ${USE_ENC} ${USE_ACL} ${USE_DBS} ${USE_CMP} ${USE_LANG} ${USE_UDEV} ${USE_VCS} ${USE_CHAR} ${USE_SERVERS} ${USE_PAX} ${USE_AUDIO} ${USE_IMG} ${USE_GRAPH} ${USE_DISPLAY} ${USE_MULTI} ${USE_MPLAYER} ${USE_BROWSE} ${USE_WORD} ${USE_GAMES} ${USE_XFCE4} ${USE_MISC}"
XFCE_PLUGINS="trash menu logout"
-VIDEO_CARDS="fbdev nouveau radeon"
+INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard mouse mutouch penmount tslib void"
+VIDEO_CARDS="apm ark ast chips cirrus epson fbdev glint i128 i740 intel mach64 mga modesetting nouveau nv r128 radeon rendition s3 s3virge savage siliconmotion sis sisusb tdfx tga trident tseng v4l vesa"
LINGUAS="en"
PORTDIR_OVERLAY="/var/lib/layman/hardened-development"
diff --git a/tools-uclibc/desktop/portage/package.mask/sqlite b/tools-uclibc/desktop/portage/package.mask/sqlite
deleted file mode 100644
index 285cee1..0000000
--- a/tools-uclibc/desktop/portage/package.mask/sqlite
+++ /dev/null
@@ -1 +0,0 @@
->dev-db/sqlite-3.7.14.1
diff --git a/tools-uclibc/desktop/portage/profile/package.use.mask/gnumeric b/tools-uclibc/desktop/portage/profile/package.use.mask/gnumeric
new file mode 100644
index 0000000..2589ec2
--- /dev/null
+++ b/tools-uclibc/desktop/portage/profile/package.use.mask/gnumeric
@@ -0,0 +1 @@
+app-office/gnumeric introspection
diff --git a/tools-uclibc/desktop/portage/profile/package.use.mask/goffice b/tools-uclibc/desktop/portage/profile/package.use.mask/goffice
new file mode 100644
index 0000000..2942918
--- /dev/null
+++ b/tools-uclibc/desktop/portage/profile/package.use.mask/goffice
@@ -0,0 +1 @@
+x11-libs/goffice introspection
diff --git a/tools-uclibc/desktop/portage/profile/package.use.mask/lvm2 b/tools-uclibc/desktop/portage/profile/package.use.mask/lvm2
new file mode 100644
index 0000000..6c9f906
--- /dev/null
+++ b/tools-uclibc/desktop/portage/profile/package.use.mask/lvm2
@@ -0,0 +1 @@
+sys-fs/lvm2 thin
diff --git a/tools-uclibc/desktop/world b/tools-uclibc/desktop/world
index 6167b95..c485f52 100644
--- a/tools-uclibc/desktop/world
+++ b/tools-uclibc/desktop/world
@@ -53,7 +53,6 @@ sys-devel/gcc
sys-devel/gdb
sys-fs/cryptsetup
sys-kernel/genkernel
-
sys-libs/cracklib
sys-libs/db
sys-libs/gdbm
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/portage/profile/package.use.mask/, tools-uclibc/desktop/, ...
@ 2013-05-14 0:51 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2013-05-14 0:51 UTC (permalink / raw
To: gentoo-commits
commit: eae1e33da54cc4e32f77dc882af0401b32084255
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue May 14 00:48:30 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue May 14 00:51:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=eae1e33d
tools-uclibc/desktop: expand supported graphics cards
---
tools-uclibc/desktop/build.sh | 19 +++++++++++++------
tools-uclibc/desktop/portage/make.conf.2 | 3 ++-
tools-uclibc/desktop/portage/make.conf.3 | 3 ++-
tools-uclibc/desktop/portage/package.mask/sqlite | 1 -
.../portage/profile/package.use.mask/gnumeric | 1 +
.../portage/profile/package.use.mask/goffice | 1 +
.../desktop/portage/profile/package.use.mask/lvm2 | 1 +
tools-uclibc/desktop/world | 1 -
8 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/tools-uclibc/desktop/build.sh b/tools-uclibc/desktop/build.sh
index e7d8b60..5162828 100755
--- a/tools-uclibc/desktop/build.sh
+++ b/tools-uclibc/desktop/build.sh
@@ -20,10 +20,10 @@ cp -f lilo.conf desktop-amd64-uclibc-hardened/etc/lilo.conf
rm -f desktop-amd64-uclibc-hardened/etc/portage/make.conf.catalyst
cp -f portage/make.conf.1 desktop-amd64-uclibc-hardened/etc/portage/make.conf
-for d in env package.accept_keywords package.mask package.use; do
- [[ "$(ls portage/${d})" != "" ]] && cp -f portage/${d}/* desktop-amd64-uclibc-hardened/etc/portage/${d}/
+for d in env package.accept_keywords package.mask package.use profile; do
+ [[ -a portage/"${d}" ]] && cp -af portage/${d} desktop-amd64-uclibc-hardened/etc/portage
done
-cp portage/package.env desktop-amd64-uclibc-hardened/etc/portage/
+cp -af portage/package.env desktop-amd64-uclibc-hardened/etc/portage
cp -f toolchain.sh desktop-amd64-uclibc-hardened/tmp/
chroot desktop-amd64-uclibc-hardened/ /tmp/toolchain.sh
@@ -42,6 +42,7 @@ cp -f update.sh desktop-amd64-uclibc-hardened/tmp/
chroot desktop-amd64-uclibc-hardened/ /tmp/update.sh
rm -f desktop-amd64-uclibc-hardened/tmp/update.sh
+mkdir -p desktop-amd64-uclibc-hardened/boot
genkernel \
--kernel-config=config \
@@ -49,11 +50,15 @@ genkernel \
--symlink \
--no-mountboot \
--kerneldir=/usr/src/linux-lilblue \
- --bootdir=/root/lilblue/desktop-amd64-uclibc-hardened/boot/ \
- --module-prefix=/root/lilblue/desktop-amd64-uclibc-hardened/ \
- --modprobedir=/root/lilblue/desktop-amd64-uclibc-hardened/etc/modprobe.d \
+ --bootdir=/root/releng/tools-uclibc/desktop/desktop-amd64-uclibc-hardened/boot/ \
+ --module-prefix=/root/releng/tools-uclibc/desktop/desktop-amd64-uclibc-hardened/ \
+ --modprobedir=/root/releng/tools-uclibc/desktop/desktop-amd64-uclibc-hardened/etc/modprobe.d \
all
+for i in $(find /root/releng/tools-uclibc/desktop/desktop-amd64-uclibc-hardened/lib/modules -iname *ko); do
+ objcopy --strip-unneeded $i
+done
+
ln -sf net.lo desktop-amd64-uclibc-hardened/etc/init.d/net.eth0
chroot desktop-amd64-uclibc-hardened/ rc-update add alsasound default
chroot desktop-amd64-uclibc-hardened/ rc-update add cupsd default
@@ -73,6 +78,8 @@ rm -f desktop-amd64-uclibc-hardened/tmp/passwd.sh
rm -rf desktop-amd64-uclibc-hardened/home/gentoo
cp -a gentoo desktop-amd64-uclibc-hardened/home/
+chroot desktop-amd64-uclibc-hardened/ chown -R gentoo:gentoo /home/gentoo
+sed -i 's/# \(%wheel.*NOPASSWD\)/\1/' desktop-amd64-uclibc-hardened/etc/sudoers
sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1slim/' desktop-amd64-uclibc-hardened/etc/conf.d/xdm
sed -i 's/^\(login.*\)/# \1/' desktop-amd64-uclibc-hardened/etc/slim.conf
diff --git a/tools-uclibc/desktop/passwd.sh b/tools-uclibc/desktop/passwd.sh
old mode 100644
new mode 100755
diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2
index bf64b0c..4332bbe 100644
--- a/tools-uclibc/desktop/portage/make.conf.2
+++ b/tools-uclibc/desktop/portage/make.conf.2
@@ -34,7 +34,8 @@ USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-synt
USE="${USE_BASE} ${USE_GCC} ${USE_ENC} ${USE_ACL} ${USE_DBS} ${USE_CMP} ${USE_LANG} ${USE_UDEV} ${USE_VCS} ${USE_CHAR} ${USE_SERVERS} ${USE_PAX} ${USE_AUDIO} ${USE_IMG} ${USE_GRAPH} ${USE_DISPLAY} ${USE_MULTI} ${USE_MPLAYER} ${USE_BROWSE} ${USE_WORD} ${USE_GAMES} ${USE_XFCE4} ${USE_MISC}"
XFCE_PLUGINS="trash menu logout"
-VIDEO_CARDS="fbdev nouveau radeon"
+INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard mouse mutouch penmount tslib void"
+VIDEO_CARDS="apm ark ast chips cirrus epson fbdev glint i128 i740 intel mach64 mga modesetting nouveau nv r128 radeon rendition s3 s3virge savage siliconmotion sis sisusb tdfx tga trident tseng v4l vesa"
LINGUAS="en"
PORTDIR_OVERLAY="/var/lib/layman/hardened-development"
diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3
index 0fd4ae5..6873c92 100644
--- a/tools-uclibc/desktop/portage/make.conf.3
+++ b/tools-uclibc/desktop/portage/make.conf.3
@@ -34,7 +34,8 @@ USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-synt
USE="${USE_BASE} ${USE_GCC} ${USE_ENC} ${USE_ACL} ${USE_DBS} ${USE_CMP} ${USE_LANG} ${USE_UDEV} ${USE_VCS} ${USE_CHAR} ${USE_SERVERS} ${USE_PAX} ${USE_AUDIO} ${USE_IMG} ${USE_GRAPH} ${USE_DISPLAY} ${USE_MULTI} ${USE_MPLAYER} ${USE_BROWSE} ${USE_WORD} ${USE_GAMES} ${USE_XFCE4} ${USE_MISC}"
XFCE_PLUGINS="trash menu logout"
-VIDEO_CARDS="fbdev nouveau radeon"
+INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard mouse mutouch penmount tslib void"
+VIDEO_CARDS="apm ark ast chips cirrus epson fbdev glint i128 i740 intel mach64 mga modesetting nouveau nv r128 radeon rendition s3 s3virge savage siliconmotion sis sisusb tdfx tga trident tseng v4l vesa"
LINGUAS="en"
PORTDIR_OVERLAY="/var/lib/layman/hardened-development"
diff --git a/tools-uclibc/desktop/portage/package.mask/sqlite b/tools-uclibc/desktop/portage/package.mask/sqlite
deleted file mode 100644
index 285cee1..0000000
--- a/tools-uclibc/desktop/portage/package.mask/sqlite
+++ /dev/null
@@ -1 +0,0 @@
->dev-db/sqlite-3.7.14.1
diff --git a/tools-uclibc/desktop/portage/profile/package.use.mask/gnumeric b/tools-uclibc/desktop/portage/profile/package.use.mask/gnumeric
new file mode 100644
index 0000000..2589ec2
--- /dev/null
+++ b/tools-uclibc/desktop/portage/profile/package.use.mask/gnumeric
@@ -0,0 +1 @@
+app-office/gnumeric introspection
diff --git a/tools-uclibc/desktop/portage/profile/package.use.mask/goffice b/tools-uclibc/desktop/portage/profile/package.use.mask/goffice
new file mode 100644
index 0000000..2942918
--- /dev/null
+++ b/tools-uclibc/desktop/portage/profile/package.use.mask/goffice
@@ -0,0 +1 @@
+x11-libs/goffice introspection
diff --git a/tools-uclibc/desktop/portage/profile/package.use.mask/lvm2 b/tools-uclibc/desktop/portage/profile/package.use.mask/lvm2
new file mode 100644
index 0000000..6c9f906
--- /dev/null
+++ b/tools-uclibc/desktop/portage/profile/package.use.mask/lvm2
@@ -0,0 +1 @@
+sys-fs/lvm2 thin
diff --git a/tools-uclibc/desktop/world b/tools-uclibc/desktop/world
index 6167b95..c485f52 100644
--- a/tools-uclibc/desktop/world
+++ b/tools-uclibc/desktop/world
@@ -53,7 +53,6 @@ sys-devel/gcc
sys-devel/gdb
sys-fs/cryptsetup
sys-kernel/genkernel
-
sys-libs/cracklib
sys-libs/db
sys-libs/gdbm
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-14 0:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-14 0:48 [gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/portage/profile/package.use.mask/, tools-uclibc/desktop/, Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2013-05-14 0:51 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