From 197d4a71332b6aed76fb43939ba6f1228bdd4447 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Mon, 2 May 2011 06:54:33 -0500 Subject: [PATCH] script/makepkg: switch to using port.options dir instead --- script/makepkg | 17 +++++++------ .../config/port.options/e2fsprogs/options | 5 ++++ .../SS4200/config/port.options/flag/options | 5 ++++ .../config/port.options/fusefs-ntfs/options | 6 +++++ .../SS4200/config/port.options/fusefs/options | 5 ++++ .../SS4200/config/port.options/gamin/options | 5 ++++ .../config/port.options/gkrellm/options | 9 +++++++ .../SS4200/config/port.options/glib20/options | 5 ++++ .../config/port.options/libiconv/options | 6 +++++ .../SS4200/config/port.options/m4/options | 5 ++++ .../config/port.options/ntfsprogs/options | 8 ++++++ .../SS4200/config/port.options/perl/options | 13 ++++++++++ .../config/port.options/python26/options | 12 +++++++++ .../SS4200/config/port.options/rsync/options | 11 +++++++++ .../SS4200/config/port.options/ruby/options | 7 ++++++ .../config/port.options/samba35/options | 23 ++++++++++++++++++ .../SS4200/config/port.options/screen/options | 11 +++++++++ .../SS4200/config/port.options/sudo/options | 9 +++++++ targets/amd64/SS4200/config/port_options.cpio | Bin 8704 -> 0 bytes .../i386/SABA/config/{ports.lst => port.lst} | 0 20 files changed, 155 insertions(+), 7 deletions(-) create mode 100644 targets/amd64/SS4200/config/port.options/e2fsprogs/options create mode 100644 targets/amd64/SS4200/config/port.options/flag/options create mode 100644 targets/amd64/SS4200/config/port.options/fusefs-ntfs/options create mode 100644 targets/amd64/SS4200/config/port.options/fusefs/options create mode 100644 targets/amd64/SS4200/config/port.options/gamin/options create mode 100644 targets/amd64/SS4200/config/port.options/gkrellm/options create mode 100644 targets/amd64/SS4200/config/port.options/glib20/options create mode 100644 targets/amd64/SS4200/config/port.options/libiconv/options create mode 100644 targets/amd64/SS4200/config/port.options/m4/options create mode 100644 targets/amd64/SS4200/config/port.options/ntfsprogs/options create mode 100644 targets/amd64/SS4200/config/port.options/perl/options create mode 100644 targets/amd64/SS4200/config/port.options/python26/options create mode 100644 targets/amd64/SS4200/config/port.options/rsync/options create mode 100644 targets/amd64/SS4200/config/port.options/ruby/options create mode 100644 targets/amd64/SS4200/config/port.options/samba35/options create mode 100644 targets/amd64/SS4200/config/port.options/screen/options create mode 100644 targets/amd64/SS4200/config/port.options/sudo/options delete mode 100644 targets/amd64/SS4200/config/port_options.cpio rename targets/i386/SABA/config/{ports.lst => port.lst} (100%) diff --git a/script/makepkg b/script/makepkg index 9deb7db..f1a4796 100755 --- a/script/makepkg +++ b/script/makepkg @@ -47,7 +47,6 @@ chprepare() { # Copy in cached configuration, if necessary [ -f "${conf_dir}/make.conf" ] && cp -p "${conf_dir}/make.conf" "${chroot_dir}/etc/make.conf" - [ -f "${conf_dir}/port_options.cpio" ] && ( cd ${chroot_dir}/var/db/ports; cpio -i ) < "${conf_dir}/port_options.cpio" # If you have WITHOUT_INFO set in src.conf during buildworld/installworld, ports that need # makeinfo and install-info will fail horribly; stub them @@ -88,6 +87,9 @@ chstartup() { # Chroot configuration cp -f /etc/resolv.conf "${chroot_dir}/etc/resolv.conf" || wtf "seeding /etc/resolv.conf failed" + # Load port configuration, now that chroot is running + port_load_config + trap "" exit hup int term kill meh "Chroot up and running in ${chroot_dir}" @@ -341,18 +343,19 @@ port_rmconfig_all() { cheval "cd /var/db/ports; find . -name 'options' -delete; find . -type d | xargs rmdir 2>/dev/null" } -# Restore port build options from cpio +# Restore port build options from directory port_load_config() { - [ -f "${conf_dir}/port_options.cpio" ] || return 0 + [ -d "${conf_dir}/port.options" ] || return 0 meh "port load-config" - cheval "cd /var/db/ports; cpio -i" < "${conf_dir}/port_options.cpio" + ( cd "${conf_dir}/port.options"; find . | cpio -oHnewc ) | cheval "cd /var/db/ports; cpio -i" || wtf "port load-config failed" } -# Dump port build options to cpio +# Dump port build options to directory port_save_config() { meh "port save-config" - cheval "cd /var/db/ports; find . -type d -o -type f -name options | cpio -oHnewc" > "${conf_dir}/port_options.cpio.tmp" || wtf "port save-config failed" - mv -f "${conf_dir}/port_options.cpio.tmp" "${conf_dir}/port_options.cpio" || wtf "port save-config atomic commit failed" + mkdir -p "${conf_dir}/port.options.tmp" + cheval "cd /var/db/ports; find . -type d -o -type f -name options | cpio -oHnewc" | ( cd "${conf_dir}/port.options.tmp"; cpio -i ) || wtf "port safe-config failed" + rm -Rf "${conf_dir}/port.options" && mv -f "${conf_dir}/port.options.tmp" "${conf_dir}/port.options" || wtf "port save-config atomic commit failed" } ######## diff --git a/targets/amd64/SS4200/config/port.options/e2fsprogs/options b/targets/amd64/SS4200/config/port.options/e2fsprogs/options new file mode 100644 index 0000000..35f1ea9 --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/e2fsprogs/options @@ -0,0 +1,5 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for e2fsprogs-libuuid-1.41.12 +_OPTIONS_READ=e2fsprogs-libuuid-1.41.12 +WITH_NLS=true diff --git a/targets/amd64/SS4200/config/port.options/flag/options b/targets/amd64/SS4200/config/port.options/flag/options new file mode 100644 index 0000000..751fe0e --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/flag/options @@ -0,0 +1,5 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for flag-1.0.1 +_OPTIONS_READ=flag-1.0.1 +WITH_BASH=true diff --git a/targets/amd64/SS4200/config/port.options/fusefs-ntfs/options b/targets/amd64/SS4200/config/port.options/fusefs-ntfs/options new file mode 100644 index 0000000..42f07e8 --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/fusefs-ntfs/options @@ -0,0 +1,6 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for fusefs-ntfs-2010.10.2 +_OPTIONS_READ=fusefs-ntfs-2010.10.2 +WITH_LOCK=true +WITH_UBLIO=true diff --git a/targets/amd64/SS4200/config/port.options/fusefs/options b/targets/amd64/SS4200/config/port.options/fusefs/options new file mode 100644 index 0000000..085deed --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/fusefs/options @@ -0,0 +1,5 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for fusefs-kmod-0.3.9.p1.20080208_7 +_OPTIONS_READ=fusefs-kmod-0.3.9.p1.20080208_7 +WITH_AUTOSETUP=true diff --git a/targets/amd64/SS4200/config/port.options/gamin/options b/targets/amd64/SS4200/config/port.options/gamin/options new file mode 100644 index 0000000..fd4e4e9 --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/gamin/options @@ -0,0 +1,5 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for gamin-0.1.10_4 +_OPTIONS_READ=gamin-0.1.10_4 +WITHOUT_GAM_POLLER=true diff --git a/targets/amd64/SS4200/config/port.options/gkrellm/options b/targets/amd64/SS4200/config/port.options/gkrellm/options new file mode 100644 index 0000000..87d1bc0 --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/gkrellm/options @@ -0,0 +1,9 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for gkrellm-2.3.5 +_OPTIONS_READ=gkrellm-2.3.5 +WITHOUT_GKRELLM_CLIENT=true +WITHOUT_GNUTLS=true +WITHOUT_NLS=true +WITHOUT_NTLM=true +WITH_OPENSSL=true diff --git a/targets/amd64/SS4200/config/port.options/glib20/options b/targets/amd64/SS4200/config/port.options/glib20/options new file mode 100644 index 0000000..f9dfd6d --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/glib20/options @@ -0,0 +1,5 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for glib+noperl+nopython-2.26.1_1 +_OPTIONS_READ=glib+noperl+nopython-2.26.1_1 +WITHOUT_COLLATION_FIX=true diff --git a/targets/amd64/SS4200/config/port.options/libiconv/options b/targets/amd64/SS4200/config/port.options/libiconv/options new file mode 100644 index 0000000..b1738fb --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/libiconv/options @@ -0,0 +1,6 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for libiconv-1.13.1_1 +_OPTIONS_READ=libiconv-1.13.1_1 +WITH_EXTRA_ENCODINGS=true +WITHOUT_EXTRA_PATCHES=true diff --git a/targets/amd64/SS4200/config/port.options/m4/options b/targets/amd64/SS4200/config/port.options/m4/options new file mode 100644 index 0000000..0bd6c64 --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/m4/options @@ -0,0 +1,5 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for m4-1.4.15,1 +_OPTIONS_READ=m4-1.4.15,1 +WITH_LIBSIGSEGV=true diff --git a/targets/amd64/SS4200/config/port.options/ntfsprogs/options b/targets/amd64/SS4200/config/port.options/ntfsprogs/options new file mode 100644 index 0000000..0a9bd3d --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/ntfsprogs/options @@ -0,0 +1,8 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for ntfsprogs-2.0.0_1 +_OPTIONS_READ=ntfsprogs-2.0.0_1 +WITHOUT_GNOMEVFS2=true +WITH_LOCK=true +WITH_UBLIO=true +WITH_UUID=true diff --git a/targets/amd64/SS4200/config/port.options/perl/options b/targets/amd64/SS4200/config/port.options/perl/options new file mode 100644 index 0000000..4065a7d --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/perl/options @@ -0,0 +1,13 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for perl-5.10.1_3 +_OPTIONS_READ=perl-5.10.1_3 +WITHOUT_DEBUGGING=true +WITHOUT_GDBM=true +WITHOUT_PERL_MALLOC=true +WITH_PERL_64BITINT=true +WITH_THREADS=true +WITHOUT_MULTIPLICITY=true +WITHOUT_SUIDPERL=true +WITHOUT_SITECUSTOMIZE=true +WITH_USE_PERL=true diff --git a/targets/amd64/SS4200/config/port.options/python26/options b/targets/amd64/SS4200/config/port.options/python26/options new file mode 100644 index 0000000..2186b5b --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/python26/options @@ -0,0 +1,12 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for python26-2.6.6 +_OPTIONS_READ=python26-2.6.6 +WITH_THREADS=true +WITHOUT_HUGE_STACK_SIZE=true +WITHOUT_SEM=true +WITHOUT_PTH=true +WITH_UCS4=true +WITH_PYMALLOC=true +WITH_IPV6=true +WITHOUT_FPECTL=true diff --git a/targets/amd64/SS4200/config/port.options/rsync/options b/targets/amd64/SS4200/config/port.options/rsync/options new file mode 100644 index 0000000..0a124a0 --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/rsync/options @@ -0,0 +1,11 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for rsync-3.0.7 +_OPTIONS_READ=rsync-3.0.7 +WITHOUT_POPT_PORT=true +WITH_SSH=true +WITHOUT_FLAGS=true +WITHOUT_ATIMES=true +WITHOUT_ACL=true +WITHOUT_ICONV=true +WITHOUT_TIMELIMIT=true diff --git a/targets/amd64/SS4200/config/port.options/ruby/options b/targets/amd64/SS4200/config/port.options/ruby/options new file mode 100644 index 0000000..6c88971 --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/ruby/options @@ -0,0 +1,7 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for ruby-1.8.7.302,1 +_OPTIONS_READ=ruby-1.8.7.302,1 +WITHOUT_ONIGURUMA=true +WITH_RDOC=true +WITHOUT_DEBUG=true diff --git a/targets/amd64/SS4200/config/port.options/samba35/options b/targets/amd64/SS4200/config/port.options/samba35/options new file mode 100644 index 0000000..64f04d2 --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/samba35/options @@ -0,0 +1,23 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for samba35-3.5.6_1 +_OPTIONS_READ=samba35-3.5.6_1 +WITHOUT_LDAP=true +WITHOUT_ADS=true +WITHOUT_CUPS=true +WITHOUT_WINBIND=true +WITHOUT_SWAT=true +WITHOUT_ACL_SUPPORT=true +WITH_AIO_SUPPORT=true +WITH_FAM_SUPPORT=true +WITH_SYSLOG=true +WITHOUT_QUOTAS=true +WITHOUT_UTMP=true +WITHOUT_PAM_SMBPASS=true +WITHOUT_DNSUPDATE=true +WITHOUT_AVAHI=true +WITHOUT_EXP_MODULES=true +WITHOUT_POPT=true +WITHOUT_IPV6=true +WITHOUT_MAX_DEBUG=true +WITHOUT_SMBTORTURE=true diff --git a/targets/amd64/SS4200/config/port.options/screen/options b/targets/amd64/SS4200/config/port.options/screen/options new file mode 100644 index 0000000..172b339 --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/screen/options @@ -0,0 +1,11 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for screen-4.0.3_9 +_OPTIONS_READ=screen-4.0.3_9 +WITHOUT_CJK=true +WITHOUT_INFO=true +WITH_MAN=true +WITH_NETHACK=true +WITH_XTERM_256=true +WITHOUT_HOSTINLOCKED=true +WITHOUT_SHOWENC=true diff --git a/targets/amd64/SS4200/config/port.options/sudo/options b/targets/amd64/SS4200/config/port.options/sudo/options new file mode 100644 index 0000000..6847041 --- /dev/null +++ b/targets/amd64/SS4200/config/port.options/sudo/options @@ -0,0 +1,9 @@ +# This file is auto-generated by 'make config'. +# No user-servicable parts inside! +# Options for sudo-1.7.4.4_1 +_OPTIONS_READ=sudo-1.7.4.4_1 +WITHOUT_LDAP=true +WITH_INSULTS=true +WITHOUT_DISABLE_ROOT_SUDO=true +WITHOUT_DISABLE_AUTH=true +WITHOUT_NOARGS_SHELL=true diff --git a/targets/amd64/SS4200/config/port_options.cpio b/targets/amd64/SS4200/config/port_options.cpio deleted file mode 100644 index ec2b9e77f8e6c8d9a6f5a3e689effb3247e0acd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8704 zcmd5>U31zv6wPyg1(`ndVHaZ?Lg1kf1|0C#UyJP|-4~59CS@8R14(D{@ApcUgd|Ai z?2I$ZwBsNN9n87s-g9O1+PpR`(=_{op@pwz&nlPrdit`uy`@!LFNTFY*X=HgRnIh6 zU3r|pv)Nz91)xzp%UWviOuNDx^x5aDs}?V3>y6GK-z@U(m5dAD)ieiIPOfaNaJ3{{ z+oJe7TmuudOee{AbxJ zcH7nZ;fwL&^1TW99UL+*Wyf@qTYuChf8zpT8}i*Nh#NZ{O~i95=aFArZSg`XpvQ}_!hF7pz{ z;M@9RdgvM3#Up3t|ntA9nV;D7V}vZ*A3*+A?66bz*iLevfRq? zvmiX{Iiz{iV%+HBr}AYY?vcU9wO8F}yJwh27Y!BBDU&RRj{g$$hSQ}N-cZF6asww6 z^ccG7%#jp&pStq^*;h(YokdCNg;>q5YCdMs9mEP1wHOOI(Q31?P^BI@7V`JSf>}_V zz9$wc+z*Tenqz-%cFQ(|gE2IoECWpMz_iT)x>kZix0-~4lciDOrWy5bQaxJ|pQGn) z$o&lwr#>I^^+xBZ+&`+hxGJ@J9aCKEiqs8#E;a=}gmI6|eSjarfbA<>IW5#xn3Ct1 ziiyXWLiRms6>E7q83po4?9P1@I6f%zIDyD$zc=zgvw~kn=?r%yN=6SdKlNhY8++;Z z;~p3;$-D{PN*VQ1cbp|@6nOs#Rvu-EOMt7@K&+Sx7NlnC!oQ}bIvG*UaiS>}JpZx~mgs`>ne0fC-t zqi6I^ij^|SG$o&sLN}9uT~Qpmr!@1l7WVbd}Z`W;(yYlg4o`Wm6X=DYULAkz6RTt*&a4Mcz?1PI`jviNBxN=hHLgo7f$vG(@D@ zmlK}!F~YoMZC}gJxuEv_+?S7!8yT1MXZrYHxUBur#isZih2rw?XujrFHwvKvPg0c7 zpkId0F#%7%%|W^W8vC9rb~>b43bT}Db+(?Tc|MT(La@Mt8#hdnGr6ETcW;1a!CUPQ zuiHYcKkqxsuuOVZt>u{oB6vE2%US+_ewYBl(=yXg&n?6mMiGAI1GY+fl9e$3%NE`E zj(Sq*q+Y;|DA_W2E_ReY4iax1g}3q${+RCt9&MZzuUoSw6uiDyKeUbylNS-tJ2)BJ zRB&t71BP4FeQwH4Hp4vzLi2iu8~tOu!$%