| 1 |
commit: 11c05eab40e8ee93718525790772a5550bd7f20c |
| 2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 3 |
AuthorDate: Thu Aug 23 14:44:51 2012 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com> |
| 5 |
CommitDate: Thu Aug 23 14:44:51 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=11c05eab |
| 7 |
|
| 8 |
fixes so that x86-fbsd stage files can be created on amd64-fbsd |
| 9 |
|
| 10 |
--- |
| 11 |
dev-util/catalyst/Manifest | 2 +- |
| 12 |
.../catalyst/files/catalyst-2.0.10.1-fbsd.patch | 19 +++++++++++++++++++ |
| 13 |
scripts/mkstages/stages_builder.sh | 9 ++++++--- |
| 14 |
3 files changed, 26 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest |
| 17 |
index dcf9114..491ad89 100644 |
| 18 |
--- a/dev-util/catalyst/Manifest |
| 19 |
+++ b/dev-util/catalyst/Manifest |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
AUX 2.0.8.1-arm-softfp.patch 1551 RMD160 20b47d803443136ab511ef5ad5b7d5b2ea0e0715 SHA1 c51b4dc05bffaed7911d447bea7993400854152e SHA256 54ae43557d15bd51d6227aec8160d61c07e45b1cb6b6c8f11fe1c4804772afcc |
| 22 |
-AUX catalyst-2.0.10.1-fbsd.patch 6248 RMD160 c5bf9c3ef1ab84dc02a57c30163aad102dc5985c SHA1 2a5d2b268fc96a293d00df3e25df23f2a50890d0 SHA256 958e7f773121eb6a10e9f6b4c551216658221985e2487b8f62a0c601164fd666 |
| 23 |
+AUX catalyst-2.0.10.1-fbsd.patch 7223 RMD160 c084ddbd41a53c4d9f9e2087978419ca630c0ab1 SHA1 c7b1b05e3e7c86f06278bc34fa16fe9fb1aecda7 SHA256 ea4d2ee2cc2dae5f2d3b12109fbe11ab930db926d00618279a76ce4cf11980ef |
| 24 |
DIST catalyst-2.0.10.1.tar.bz2 909073 RMD160 48d4eeb7e3dfd14f1c1f04542371580999d97e63 SHA1 c8cc79c635b531fdc5592a8cf230706817a8458a SHA256 3ed2217c579dcc01e13afc017dbfea869d2c99a0c169290e678fc113db6891ed |
| 25 |
EBUILD catalyst-2.0.10.1.ebuild 3331 RMD160 544075a6dce9a081035403c5adf2159b389d166a SHA1 923f804f2e715235e89aa0d29d33ff546de14d9f SHA256 e16830ca69796659ed19fb00121a920b3ef66a0be9db63d09261b08f76eeb111 |
| 26 |
|
| 27 |
diff --git a/dev-util/catalyst/files/catalyst-2.0.10.1-fbsd.patch b/dev-util/catalyst/files/catalyst-2.0.10.1-fbsd.patch |
| 28 |
index 45d8744..423cf79 100644 |
| 29 |
--- a/dev-util/catalyst/files/catalyst-2.0.10.1-fbsd.patch |
| 30 |
+++ b/dev-util/catalyst/files/catalyst-2.0.10.1-fbsd.patch |
| 31 |
@@ -150,3 +150,22 @@ diff -Nur catalyst-2.0.10.1.orig/targets/support/chroot-functions.sh catalyst-2. |
| 32 |
# We do this everywhere, so why not put it in this script |
| 33 |
run_default_funcs |
| 34 |
|
| 35 |
+diff -Nur catalyst-2.0.10.1.orig/arch/x86.py catalyst-2.0.10.1/arch/x86.py |
| 36 |
+--- catalyst-2.0.10.1.orig/arch/x86.py 2012-08-23 23:03:36.000000000 +0900 |
| 37 |
++++ catalyst-2.0.10.1/arch/x86.py 2012-08-23 23:07:27.000000000 +0900 |
| 38 |
+@@ -7,9 +7,12 @@ |
| 39 |
+ def __init__(self,myspec): |
| 40 |
+ builder.generic.__init__(self,myspec) |
| 41 |
+ if self.settings["buildarch"]=="amd64": |
| 42 |
+- if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"): |
| 43 |
+- raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)" |
| 44 |
+- self.settings["CHROOT"]="linux32 chroot" |
| 45 |
++ if os.uname()[0] == "Linux": |
| 46 |
++ if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"): |
| 47 |
++ raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)" |
| 48 |
++ self.settings["CHROOT"]="linux32 chroot" |
| 49 |
++ else: |
| 50 |
++ self.settings["CHROOT"]="chroot" |
| 51 |
+ self.settings["crosscompile"] = False; |
| 52 |
+ else: |
| 53 |
+ self.settings["CHROOT"]="chroot" |
| 54 |
|
| 55 |
diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh |
| 56 |
index 9160347..97bdb1c 100755 |
| 57 |
--- a/scripts/mkstages/stages_builder.sh |
| 58 |
+++ b/scripts/mkstages/stages_builder.sh |
| 59 |
@@ -89,7 +89,6 @@ prepare(){ |
| 60 |
do |
| 61 |
cd ${dir} |
| 62 |
gsed -i "/${TARGETVER}/d" Manifest |
| 63 |
- rm *8.1*.ebuild |
| 64 |
ls -1 *.ebuild > /dev/null 2>&1 |
| 65 |
|
| 66 |
if [ $? -eq 0 ] ; then |
| 67 |
@@ -175,13 +174,17 @@ mk_stages(){ |
| 68 |
catalyst -C target=stage3 version_stamp=fbsd-${TARGETVER}-${WORKDATE} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER} snapshot=${WORKDATE} source_subpath=default/stage2-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/portage.bsd-overlay chost=${CATALYST_CHOST} || exit 1 |
| 69 |
} |
| 70 |
|
| 71 |
-prepare |
| 72 |
+prepare $1 |
| 73 |
+ |
| 74 |
if [ ! -e "/var/tmp/catalyst/snapshots/portage-${WORKDATE}.tar.bz2" ] ; then |
| 75 |
catalyst -C target=snapshot version_stamp=${WORKDATE} || exit 1 |
| 76 |
fi |
| 77 |
-if [ ! -e /var/tmp/catalyst/builds/default/stage3tmp-${TARGETSUBARCH}-freebsd-${TARGETVER}.tar.bz2 ] && [ "${OLDVER}" != "${TARGETVER}" ] ; then |
| 78 |
+ |
| 79 |
+if [ ! -e "/var/tmp/catalyst/builds/default/stage3tmp-${TARGETSUBARCH}-freebsd-${TARGETVER}.tar.bz2" ] && [ "${OLDVER}" != "${TARGETVER}" ] ; then |
| 80 |
upgrade_src_stage3 |
| 81 |
+ echo "upgrade done" |
| 82 |
fi |
| 83 |
+ |
| 84 |
mk_stages_tmp |
| 85 |
mk_stages |
Archives