tools-uclibc/desktop: update build for hardened amd64 uclibc desktop (lilblue)
This commit is contained in:
Anthony G. Basile
parent
a31c6d4bd1
commit
9321f7b86b
File diff suppressed because it is too large
Load diff
|
|
@ -282,8 +282,8 @@ show_language_toolbar=F6
|
|||
|
||||
[%General]
|
||||
config_version=4
|
||||
mplayer_bin=mplayer2
|
||||
driver\vo=xv
|
||||
mplayer_bin=mplayer
|
||||
driver\vo=x11
|
||||
driver\audio_output=alsa
|
||||
use_screenshot=true
|
||||
screenshot_folder=/home/gentoo/Pictures/smplayer_screenshots
|
||||
|
|
|
|||
1
tools-uclibc/desktop/portage/env/dovecot.conf
vendored
Normal file
1
tools-uclibc/desktop/portage/env/dovecot.conf
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
LDFLAGS="-liconv"
|
||||
|
|
@ -1 +1 @@
|
|||
CFLAGS="-lintl"
|
||||
LDFLAGS="-lintl"
|
||||
|
|
|
|||
2
tools-uclibc/desktop/portage/env/git.conf
vendored
2
tools-uclibc/desktop/portage/env/git.conf
vendored
|
|
@ -1 +1 @@
|
|||
CFLAGS="-liconv"
|
||||
LDFLAGS="-liconv"
|
||||
|
|
|
|||
2
tools-uclibc/desktop/portage/env/gpgme.conf
vendored
2
tools-uclibc/desktop/portage/env/gpgme.conf
vendored
|
|
@ -1 +1 @@
|
|||
CFLAGS=-largp
|
||||
LDFLAGS=-largp
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
CFLAGS="-lintl"
|
||||
LDFLAGS="-lintl"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
CFLAGS="-lintl"
|
||||
LDFLAGS="-lintl"
|
||||
|
|
|
|||
|
|
@ -11,5 +11,4 @@ source "/var/lib/layman/make.conf"
|
|||
|
||||
PORTDIR="/usr/portage"
|
||||
|
||||
SYNC="rsync://192.168.100.1/portage"
|
||||
GENTOO_MIRRORS="ftp://192.168.100.1/pub/gentoo"
|
||||
|
|
|
|||
|
|
@ -42,5 +42,4 @@ source "/var/lib/layman/make.conf"
|
|||
|
||||
PORTDIR="/usr/portage"
|
||||
|
||||
SYNC="rsync://192.168.100.1/portage"
|
||||
GENTOO_MIRRORS="ftp://192.168.100.1/pub/gentoo"
|
||||
|
|
|
|||
|
|
@ -42,5 +42,4 @@ source "/var/lib/layman/make.conf"
|
|||
|
||||
PORTDIR="/usr/portage"
|
||||
|
||||
SYNC="rsync://192.168.100.1/portage"
|
||||
GENTOO_MIRRORS="ftp://192.168.100.1/pub/gentoo"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
=perl-core/ExtUtils-Manifest-1.630.0 ~amd64
|
||||
|
|
@ -1 +0,0 @@
|
|||
=media-plugins/alsa-plugins-1.0.27-r2 ~amd64
|
||||
1
tools-uclibc/desktop/portage/package.accept_keywords/nas
Normal file
1
tools-uclibc/desktop/portage/package.accept_keywords/nas
Normal file
|
|
@ -0,0 +1 @@
|
|||
=media-libs/nas-1.9.4-r1 ~amd64
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
=app-text/dvipsk-5.994_p20140525 ~amd64
|
||||
=app-text/ps2pkm-1.5_p20140525 ~amd64
|
||||
=app-text/texlive-core-2014-r4 ~amd64
|
||||
=dev-libs/kpathsea-6.2.0_p20140525 ~amd64
|
||||
=dev-tex/bibtexu-3.71_p20140525 ~amd64
|
||||
=dev-texlive/texlive-basic-2014 ~amd64
|
||||
=dev-texlive/texlive-fontutils-2014 ~amd64
|
||||
=dev-texlive/texlive-latex-2014 ~amd64
|
||||
=dev-texlive/texlive-latexrecommended-2014 ~amd64
|
||||
|
|
@ -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-mail/dovecot dovecot.conf
|
||||
net-print/cups-filters cups-filters.conf
|
||||
sys-apps/coreutils coreutils.conf
|
||||
x11-drivers/xf86-video-intel x86-video-intel.conf
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
->sys-fs/e2fsprogs-1.42.7
|
||||
>sys-libs/e2fsprogs-libs-1.42.10
|
||||
>sys-fs/e2fsprogs-1.42.10
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
=media-plugins/alsa-plugins-1.0.27-r2
|
||||
|
|
@ -1 +0,0 @@
|
|||
dev-libs/DirectFB -sdl
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From 579dcdbc8aab966b22f6324a16dbf8fd08a607c3 Mon Sep 17 00:00:00 2001
|
||||
From: "Anthony G. Basile" <blueness@gentoo.org>
|
||||
Date: Fri, 17 Apr 2015 16:51:43 -0400
|
||||
Subject: [PATCH] ldso/libdl/libdl.c: do not unmap libraries.
|
||||
|
||||
---
|
||||
ldso/libdl/libdl.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
|
||||
index 49711a8..2c43c07 100644
|
||||
--- a/ldso/libdl/libdl.c
|
||||
+++ b/ldso/libdl/libdl.c
|
||||
@@ -977,7 +977,7 @@ static int do_dlclose(void *vhandle, int need_fini)
|
||||
|
||||
end = (end + ADDR_ALIGN) & PAGE_ALIGN;
|
||||
start = start & ~ADDR_ALIGN;
|
||||
- DL_LIB_UNMAP (tpnt, end - start);
|
||||
+ //DL_LIB_UNMAP (tpnt, end - start);
|
||||
/* Free elements in RTLD_LOCAL scope list */
|
||||
for (runp = tpnt->rtld_local; runp; runp = tmp) {
|
||||
tmp = runp->next;
|
||||
--
|
||||
2.0.5
|
||||
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
|
||||
index 388e3c7..ad4370a 100644
|
||||
--- a/ldso/libdl/libdl.c
|
||||
+++ b/ldso/libdl/libdl.c
|
||||
@@ -792,7 +792,7 @@ static int do_dlclose(void *vhandle, int need_fini)
|
||||
int (*dl_elf_fini) (void);
|
||||
void (*dl_brk) (void);
|
||||
struct dyn_elf *handle;
|
||||
- unsigned int end = 0, start = 0xffffffff;
|
||||
+ unsigned int end;
|
||||
unsigned int i, j;
|
||||
struct r_scope_elem *ls, *ls_next = NULL;
|
||||
struct elf_resolve **handle_rlist;
|
||||
@@ -869,8 +869,6 @@ static int do_dlclose(void *vhandle, int need_fini)
|
||||
i < tpnt->n_phent; ppnt++, i++) {
|
||||
if (ppnt->p_type != PT_LOAD)
|
||||
continue;
|
||||
- if (ppnt->p_vaddr < start)
|
||||
- start = ppnt->p_vaddr;
|
||||
if (end < ppnt->p_vaddr + ppnt->p_memsz)
|
||||
end = ppnt->p_vaddr + ppnt->p_memsz;
|
||||
}
|
||||
@@ -977,9 +975,7 @@ static int do_dlclose(void *vhandle, int need_fini)
|
||||
}
|
||||
#endif
|
||||
|
||||
- end = (end + ADDR_ALIGN) & PAGE_ALIGN;
|
||||
- start = start & ~ADDR_ALIGN;
|
||||
- DL_LIB_UNMAP (tpnt, end - start);
|
||||
+ DL_LIB_UNMAP (tpnt, end - tpnt->mapaddr);
|
||||
/* Free elements in RTLD_LOCAL scope list */
|
||||
for (runp = tpnt->rtld_local; runp; runp = tmp) {
|
||||
tmp = runp->next;
|
||||
|
|
@ -1 +0,0 @@
|
|||
app-office/gnumeric introspection
|
||||
|
|
@ -1 +0,0 @@
|
|||
x11-libs/goffice introspection
|
||||
|
|
@ -1 +0,0 @@
|
|||
sys-fs/lvm2 thin
|
||||
|
|
@ -4,8 +4,9 @@ ROOTFS="desktop-amd64-uclibc-hardened"
|
|||
|
||||
PWD="$(pwd)"
|
||||
STAGE3="/var/tmp/catalyst/builds/uclibc/hardened/amd64/stage3-amd64-uclibc-hardened.tar.bz2"
|
||||
LAYMAN="/var/lib/layman"
|
||||
KERNEL_SOURCE="/usr/src/linux-lilblue"
|
||||
LAYMAN="/var/lib/layman"
|
||||
ADDOVERLAY=""
|
||||
|
||||
|
||||
unpack_stage3() {
|
||||
|
|
@ -38,6 +39,7 @@ populate_etc() {
|
|||
|
||||
rm -f "${ROOTFS}"/etc/portage/make.conf.catalyst
|
||||
cp -f portage/make.conf.1 "${ROOTFS}"/etc/portage/make.conf
|
||||
[[ -z "${ADDOVERLAY}" ]] && sed -i '/^source/,+1d' "${ROOTFS}"/etc/portage/make.conf
|
||||
|
||||
rm -rf "${ROOTFS}"/etc/portage/patches
|
||||
for d in env package.accept_keywords package.env package.mask package.unmask package.use patches profile repos.conf; do
|
||||
|
|
@ -53,6 +55,7 @@ rebuild_toolchain() {
|
|||
|
||||
rebuild_world() {
|
||||
cp -f portage/make.conf.2 "${ROOTFS}"/etc/portage/make.conf
|
||||
[[ -z "${ADDOVERLAY}" ]] && sed -i '/^source/,+1d' "${ROOTFS}"/etc/portage/make.conf
|
||||
cp -f world.1 "${ROOTFS}"/var/lib/portage/world
|
||||
cp -f rebuild.sh "${ROOTFS}"/tmp/
|
||||
chroot "${ROOTFS}"/ /tmp/rebuild.sh
|
||||
|
|
@ -62,6 +65,7 @@ rebuild_world() {
|
|||
|
||||
update_world() {
|
||||
cp -f portage/make.conf.3 "${ROOTFS}"/etc/portage/make.conf
|
||||
[[ -z "${ADDOVERLAY}" ]] && sed -i '/^source/,+1d' "${ROOTFS}"/etc/portage/make.conf
|
||||
cp -f world.2 "${ROOTFS}"/var/lib/portage/world
|
||||
|
||||
cp -f update.sh "${ROOTFS}"/tmp/
|
||||
|
|
@ -138,9 +142,8 @@ setup_confs() {
|
|||
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}"
|
||||
#wget -O "${ROOTFS}"/usr/share/pixmaps/backgrounds/gnome/background-default.jpg "${IMAGE}"
|
||||
|
||||
sed -i '/^SYNC/d' "${ROOTFS}"/etc/portage/make.conf
|
||||
sed -i '/^GENTOO_MIRRORS/d' "${ROOTFS}"/etc/portage/make.conf
|
||||
sed -i 's/^MAKEOPTS/#MAKEOPTS/' "${ROOTFS}"/etc/portage/make.conf
|
||||
|
||||
|
|
@ -169,11 +172,11 @@ unmount_dirs() {
|
|||
|
||||
bundle_it() {
|
||||
local DATE=$(date +%Y%m%d)
|
||||
local NAME="${ROOTFS}"-"${DATE}".tar.bz2
|
||||
local NAME="${ROOTFS}"-"${DATE}".tar.xz
|
||||
local DIGESTS="${NAME}".DIGESTS
|
||||
|
||||
cd "${ROOTFS}"
|
||||
tar -j -c -f ../"${NAME}" .
|
||||
tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -J -c -f ../"${NAME}" .
|
||||
|
||||
cd ..
|
||||
>"${DIGESTS}"
|
||||
|
|
@ -192,9 +195,16 @@ bundle_it() {
|
|||
}
|
||||
|
||||
main() {
|
||||
|
||||
while getopts ":a" opt; do
|
||||
case $opt in
|
||||
a) ADDOVERLAY="yes" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
unpack_stage3
|
||||
mount_dirs
|
||||
add_overlay
|
||||
[[ ! -z "${ADDOVERLAY}" ]] && add_overlay
|
||||
populate_etc
|
||||
rebuild_toolchain
|
||||
rebuild_world
|
||||
|
|
|
|||
Loading…
Reference in a new issue