public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2014-02-05 20:11 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2014-02-05 20:11 UTC (permalink / raw
  To: gentoo-commits

commit:     765628f6fd1f76bc0a23de190646846ded1c6995
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 20:11:58 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb  5 20:11:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=765628f6

tools-musl: automatically detect amd64 vs i686

---
 tools-musl/run.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 4ff3785..c9127b4 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -1,15 +1,18 @@
 #!/bin/bash
 
-MYARCH=${1:-"amd64"}
-
-if [[ "$MYARCH" != "amd64" && "$MYARCH" != "i686" ]]; then
+TEST_ARCH=$(file -b /usr/lib/libc.so | sed -e 's/^.*shared object, //' -e 's/,.*$//')
+
+if [[ "${TEST_ARCH}" == "Intel 80386" ]]; then
+	MYARCH="i686"
+	ALTARCH="i386"
+elif [[ "${TEST_ARCH}" == "x86-64" ]]; then
+	MYARCH="amd64"
+	ALTARCH="x86_64"
+else
 	echo "Unsupported arch $MYARCH"
 	exit
 fi
 
-[[ "$MYARCH" == "amd64" ]] && ALTARCH="x86_64"
-[[ "$MYARCH" == "i686" ]] && ALTARCH="i386"
-
 ROOTFS="stage4-${MYARCH}-musl-vanilla"
 PWD="$(pwd)"
 
@@ -18,9 +21,9 @@ prepare_etc () {
 	cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/
 
 	if [[ "$MYARCH" == "amd64" ]]; then
-		sed -i "s/ALTARCH/${ALTARCH}/" "${ROOTFS}"/etc/make.conf
+		sed -i "s/ALTARCH/${ALTARCH}/" "${ROOTFS}"/etc/portage/make.conf
 	elif [[ "$MYARCH" == "i686" ]]; then
-		sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/make.conf
+		sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/portage/make.conf
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2014-02-05 20:13 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2014-02-05 20:13 UTC (permalink / raw
  To: gentoo-commits

commit:     ce2b5f8da89b21e77d45f83c3ca4ce103171a81c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 20:14:14 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb  5 20:14:14 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=ce2b5f8d

tools-musl: fix typo

---
 tools-musl/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index c9127b4..3874cb4 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -9,7 +9,7 @@ elif [[ "${TEST_ARCH}" == "x86-64" ]]; then
 	MYARCH="amd64"
 	ALTARCH="x86_64"
 else
-	echo "Unsupported arch $MYARCH"
+	echo "Unsupported arch $TEST_ARCH"
 	exit
 fi
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2014-02-06 13:06 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2014-02-06 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     13c0b6fe6d8f5272f77ee5542773f56f2b48080e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  6 13:07:10 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb  6 13:07:10 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=13c0b6fe

tools-musl: fix ARCH dependant paths

---
 tools-musl/run.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 3874cb4..caf9491 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -3,38 +3,43 @@
 TEST_ARCH=$(file -b /usr/lib/libc.so | sed -e 's/^.*shared object, //' -e 's/,.*$//')
 
 if [[ "${TEST_ARCH}" == "Intel 80386" ]]; then
-	MYARCH="i686"
+	MY_ARCH="i686"
 	ALTARCH="i386"
 elif [[ "${TEST_ARCH}" == "x86-64" ]]; then
-	MYARCH="amd64"
+	MY_ARCH="amd64"
 	ALTARCH="x86_64"
 else
 	echo "Unsupported arch $TEST_ARCH"
 	exit
 fi
 
-ROOTFS="stage4-${MYARCH}-musl-vanilla"
+ROOTFS="stage4-${MY_ARCH}-musl-vanilla"
 PWD="$(pwd)"
 
 prepare_etc () {
 	mkdir -p "${ROOTFS}"/etc
 	cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/
 
-	if [[ "$MYARCH" == "amd64" ]]; then
+	if [[ "$MY_ARCH" == "amd64" ]]; then
 		sed -i "s/ALTARCH/${ALTARCH}/" "${ROOTFS}"/etc/portage/make.conf
-	elif [[ "$MYARCH" == "i686" ]]; then
-		sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/portage/make.conf
+	elif [[ "$MY_ARCH" == "i686" ]]; then
+		sed -i "s/ALTARCH/${MY_ARCH}/" "${ROOTFS}"/etc/portage/make.conf
 	fi
 }
 
 prepare_usr_etc() {
 	mkdir -p "${ROOTFS}"/usr/etc
 
+	local PATH_ARCH
+
+	[[ "$MY_ARCH" == "amd64" ]] && PATH_ARCH="x86_64"
+	[[ "$MY_ARCH" == "i686" ]] && PATH_ARCH="i686"
+
 	cat <<-EOF > "${ROOTFS}"/usr/etc/ld-musl-${ALTARCH}.path
 	/lib
 	/usr/lib
-	/usr/lib/gcc/${ALTARCH}-gentoo-linux-musl/4.7.3
-	/usr/${ALTARCH}-gentoo-linux-musl/lib
+	/usr/lib/gcc/${PATH_ARCH}-gentoo-linux-musl/4.7.3
+	/usr/${PATH_ARCH}-gentoo-linux-musl/lib
 	EOF
 
 	ln -sf ld-musl-${ALTARCH}.path "${ROOTFS}"/usr/etc/ld-musl.path


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2014-02-18 21:04 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2014-02-18 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     28a816ab8d304a778f99bcd8a861a89100d8c1f6
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 18:54:34 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 21:05:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=28a816ab

tools-musl: add sandbox to world

---
 tools-musl/run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index caf9491..83a8103 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -53,6 +53,7 @@ prepare_overlay() {
 
 emerge_system() {
 	ROOT="${ROOTFS}" emerge --keep-going --with-bdeps=y -uvq @system 
+	ROOT="${ROOTFS}" emerge --keep-going --with-bdeps=y -uvq sandbox
 }
 
 mk_top_level_dirs() {


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2014-06-18 11:14 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2014-06-18 11:14 UTC (permalink / raw
  To: gentoo-commits

commit:     4065dd4c8886b0dda01518a8db1941d0af16f41b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 18 11:13:14 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jun 18 11:14:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=4065dd4c

tools-musl: fix comment for run-mipsel3.sh

---
 tools-musl/run-mipsel3.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools-musl/run-mipsel3.sh b/tools-musl/run-mipsel3.sh
old mode 100644
new mode 100755
index 46cf291..5a8b315
--- a/tools-musl/run-mipsel3.sh
+++ b/tools-musl/run-mipsel3.sh
@@ -93,7 +93,7 @@ do_stages() {
 main() {
   >zzz.log
 
-#  catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
+  catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
   for arch in mipsel3; do
     for flavor in vanilla; do
@@ -101,16 +101,16 @@ main() {
     done
   done
   
-#  for arch in mipsel3; do
-#    for flavor in vanilla; do
-#      do_stages ${arch} ${flavor}
-#      ret=$?
-#      if [[ $? == 1 ]]; then
-#         echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-#         return 1
-#      fi
-#    done
-#  done
+  for arch in mipsel3; do
+    for flavor in vanilla; do
+      do_stages ${arch} ${flavor}
+      ret=$?
+      if [[ $? == 1 ]]; then
+         echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
+         return 1
+      fi
+    done
+  done
 }
 
 main $1 &


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2014-06-28 10:43 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2014-06-28 10:43 UTC (permalink / raw
  To: gentoo-commits

commit:     54ad5b197e26018a804b912e95485b50600bc5cc
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 28 10:44:04 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jun 28 10:44:04 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=54ad5b19

tools-musl: pull out code in run scripts

---
 tools-musl/{run.sh => common.sh} | 60 +---------------------------------------
 tools-musl/run-armv7a.sh         | 52 +---------------------------------
 tools-musl/run-mipsel3.sh        | 51 +---------------------------------
 tools-musl/run.sh                | 59 +--------------------------------------
 4 files changed, 4 insertions(+), 218 deletions(-)

diff --git a/tools-musl/run.sh b/tools-musl/common.sh
old mode 100755
new mode 100644
similarity index 53%
copy from tools-musl/run.sh
copy to tools-musl/common.sh
index 55651d1..2420b85
--- a/tools-musl/run.sh
+++ b/tools-musl/common.sh
@@ -4,6 +4,7 @@ source /etc/catalyst/catalyst.conf
 
 mydate=`date +%Y%m%d`
 
+
 undo_grsec() {
   [[ -d /proc/sys/kernel/grsecurity ]] || return
   for i in /proc/sys/kernel/grsecurity/chroot_* ; do
@@ -11,37 +12,6 @@ undo_grsec() {
   done
 }
 
-prepare_confs() {
-  local arch=$1
-  local flavor=$2
-
-  for s in 1 2 3; do
-
-    local cstage=stage${s}
-    local p=$(( s - 1 ))
-    [[ $p == 0 ]] && p=3
-    local pstage=stage${p}
-
-    local parch="${arch}"
-    [[ "${arch}" == "i686" ]] && parch="x86"
-
-    local tarch="${arch}"
-    [[ "${arch}" == "amd64" ]] && tarch="x86_64"
-
-    cat stage-all.conf.template | \
-      sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
-        -e "s:CSTAGE:${cstage}:g" \
-        -e "s:PSTAGE:${pstage}:g" \
-        -e "s:SARCH:${arch}:g" \
-        -e "s:PARCH:${parch}:g" \
-        -e "s:TARCH:${tarch}:g" \
-        -e "s:FLAVOR:${flavor}:g" \
-        -e "s:MYCATALYST:$(pwd):g" \
-        >  stage${s}-${arch}-musl-${flavor}.conf
-  done
-
-  sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf
-}
 
 banner() {
 cat << EOF | tee -a zzz.log > stage$1-$2-musl-$3.log
@@ -90,31 +60,3 @@ do_stages() {
 
   return 0
 }
-
-
-main() {
-  >zzz.log
-
-  undo_grsec
-
-  catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
-
-  for arch in amd64 i686; do
-    for flavor in vanilla hardened; do
-      prepare_confs ${arch} ${flavor}
-    done
-  done
-  
-  for arch in amd64 i686; do
-    for flavor in vanilla hardened; do
-      do_stages ${arch} ${flavor}
-      ret=$?
-      if [[ $? == 1 ]]; then
-         echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-         return 1
-      fi
-    done
-  done
-}
-
-main $1 &

diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index f170931..ad4fa3a 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 
-source /etc/catalyst/catalyst.conf
-
-mydate=`date +%Y%m%d`
+source common.sh
 
 prepare_confs() {
   local arch=$1
@@ -42,54 +40,6 @@ prepare_confs() {
   sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf
 }
 
-banner() {
-cat << EOF | tee -a zzz.log > stage$1-$2-musl-$3.log
-
-************************************************************************
-*    stage$1-$2-musl-$3
-************************************************************************"
-
-EOF
-}
-
-
-do_stages() {
-  local arch=$1
-  local flavor=$2
-
-  for s in 1 2 3; do
-    local tgpath="${storedir}/builds/musl/${flavor}/${arch}"
-    local target="stage${s}-${arch}-musl-${flavor}-${mydate}.tar.bz2"
-    local tglink="stage${s}-${arch}-musl-${flavor}.tar.bz2"
-
-    if [[ ! -f "${tgpath}/${tglink}" ]]; then
-       touch stage${s}-${arch}-musl-${flavor}.log
-       echo "!!! ${target} at ${tgpath} doesn't exit" \
-         | tee -a zzz.log \
-         > stage${s}-${arch}-musl-${flavor}.err
-       return 1
-    fi
-
-    banner ${s} ${arch} ${flavor}
-    catalyst -f stage${s}-${arch}-musl-${flavor}.conf \
-      | tee -a zzz.log \
-      > stage${s}-${arch}-musl-${flavor}.log \
-      2> stage${s}-${arch}-musl-${flavor}.err
-
-    if [[ -f "${tgpath}/${target}" ]]; then
-      rm -f "${tgpath}/${tglink}"
-      ln -s ${target} "${tgpath}/${tglink}"
-    else
-      echo "!!! ${target} was not generated" \
-        | tee -a zzz.log \
-        >stage${s}-${arch}-musl-${flavor}.err
-      return 1
-    fi
-  done
-
-  return 0
-}
-
 
 main() {
   >zzz.log

diff --git a/tools-musl/run-mipsel3.sh b/tools-musl/run-mipsel3.sh
index 3da4f1c..3d70505 100755
--- a/tools-musl/run-mipsel3.sh
+++ b/tools-musl/run-mipsel3.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 
-source /etc/catalyst/catalyst.conf
-
-mydate=`date +%Y%m%d`
+source common.sh
 
 prepare_confs() {
   local arch=$1
@@ -34,53 +32,6 @@ prepare_confs() {
   sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf
 }
 
-banner() {
-cat << EOF | tee -a zzz.log > stage$1-$2-musl-$3.log
-
-************************************************************************
-*    stage$1-$2-musl-$3
-************************************************************************"
-
-EOF
-}
-
-
-do_stages() {
-  local arch=$1
-  local flavor=$2
-
-  for s in 1 2 3; do
-    local tgpath="${storedir}/builds/musl/${flavor}/${arch}"
-    local target="stage${s}-${arch}-musl-${flavor}-${mydate}.tar.bz2"
-    local tglink="stage${s}-${arch}-musl-${flavor}.tar.bz2"
-
-    if [[ ! -f "${tgpath}/${tglink}" ]]; then
-       touch stage${s}-${arch}-musl-${flavor}.log
-       echo "!!! ${target} at ${tgpath} doesn't exit" \
-         | tee -a zzz.log \
-         > stage${s}-${arch}-musl-${flavor}.err
-       return 1
-    fi
-
-    banner ${s} ${arch} ${flavor}
-    catalyst -f stage${s}-${arch}-musl-${flavor}.conf \
-      | tee -a zzz.log \
-      > stage${s}-${arch}-musl-${flavor}.log \
-      2> stage${s}-${arch}-musl-${flavor}.err
-
-    if [[ -f "${tgpath}/${target}" ]]; then
-      rm -f "${tgpath}/${tglink}"
-      ln -s ${target} "${tgpath}/${tglink}"
-    else
-      echo "!!! ${target} was not generated" \
-        | tee -a zzz.log \
-        >stage${s}-${arch}-musl-${flavor}.err
-      return 1
-    fi
-  done
-
-  return 0
-}
 
 
 main() {

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 55651d1..84609aa 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -1,15 +1,6 @@
 #!/bin/bash
 
-source /etc/catalyst/catalyst.conf
-
-mydate=`date +%Y%m%d`
-
-undo_grsec() {
-  [[ -d /proc/sys/kernel/grsecurity ]] || return
-  for i in /proc/sys/kernel/grsecurity/chroot_* ; do
-    echo 0 > $i
-  done
-}
+source common.sh
 
 prepare_confs() {
   local arch=$1
@@ -43,54 +34,6 @@ prepare_confs() {
   sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf
 }
 
-banner() {
-cat << EOF | tee -a zzz.log > stage$1-$2-musl-$3.log
-
-************************************************************************
-*    stage$1-$2-musl-$3
-************************************************************************"
-
-EOF
-}
-
-
-do_stages() {
-  local arch=$1
-  local flavor=$2
-
-  for s in 1 2 3; do
-    local tgpath="${storedir}/builds/musl/${flavor}/${arch}"
-    local target="stage${s}-${arch}-musl-${flavor}-${mydate}.tar.bz2"
-    local tglink="stage${s}-${arch}-musl-${flavor}.tar.bz2"
-
-    if [[ ! -f "${tgpath}/${tglink}" ]]; then
-       touch stage${s}-${arch}-musl-${flavor}.log
-       echo "!!! ${tglink} at ${tgpath} doesn't exist" \
-         | tee -a zzz.log \
-         > stage${s}-${arch}-musl-${flavor}.err
-       return 1
-    fi
-
-    banner ${s} ${arch} ${flavor}
-    catalyst -f stage${s}-${arch}-musl-${flavor}.conf \
-      | tee -a zzz.log \
-      > stage${s}-${arch}-musl-${flavor}.log \
-      2> stage${s}-${arch}-musl-${flavor}.err
-
-    if [[ -f "${tgpath}/${target}" ]]; then
-      rm -f "${tgpath}/${tglink}"
-      ln -s ${target} "${tgpath}/${tglink}"
-    else
-      echo "!!! ${target} was not generated" \
-        | tee -a zzz.log \
-        >stage${s}-${arch}-musl-${flavor}.err
-      return 1
-    fi
-  done
-
-  return 0
-}
-
 
 main() {
   >zzz.log


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2014-08-11 22:43 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2014-08-11 22:43 UTC (permalink / raw
  To: gentoo-commits

commit:     7a409c03109130434ba21874038fc3242f2dc0f9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 22:45:11 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 22:45:11 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=7a409c03

tools-musl/run.sh: parallelize musl run

---
 tools-musl/run.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 84609aa..7f82a8e 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -43,19 +43,19 @@ main() {
   catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
   for arch in amd64 i686; do
-    for flavor in vanilla hardened; do
+    for flavor in hardened vanilla; do
       prepare_confs ${arch} ${flavor}
     done
   done
-  
+
+  # The parallelization `( do_stages ... ) &` doesn't work here
+  # if catalyst is using snapcache, bug #519656
   for arch in amd64 i686; do
-    for flavor in vanilla hardened; do
-      do_stages ${arch} ${flavor}
-      ret=$?
-      if [[ $? == 1 ]]; then
-         echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-         return 1
-      fi
+    for flavor in hardened vanilla; do
+      (
+        do_stages ${arch} ${flavor}
+        [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
+      ) &
     done
   done
 }


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2014-08-13 14:28 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2014-08-13 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     5dd1c99047e1385356fcce0b6f00c3a5f72f0f35
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 13 14:30:43 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Aug 13 14:30:43 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=5dd1c990

tools-musl: fix error handling for failed stage

---
 tools-musl/run-armv7a.sh  |  9 +++------
 tools-musl/run-mipsel3.sh | 10 +++-------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index ad4fa3a..29c1fbf 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -51,15 +51,12 @@ main() {
       prepare_confs ${arch} ${flavor}
     done
   done
-  
+
+  # No parallelization for arm.  Its too hard on the cpu!
   for arch in armv7a_hardfp; do
     for flavor in hardened vanilla; do
       do_stages ${arch} ${flavor}
-      ret=$?
-      if [[ $? == 1 ]]; then
-         echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-         return 1
-      fi
+      [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
     done
   done
 }

diff --git a/tools-musl/run-mipsel3.sh b/tools-musl/run-mipsel3.sh
index 3d70505..50e5d57 100755
--- a/tools-musl/run-mipsel3.sh
+++ b/tools-musl/run-mipsel3.sh
@@ -33,7 +33,6 @@ prepare_confs() {
 }
 
 
-
 main() {
   >zzz.log
 
@@ -44,15 +43,12 @@ main() {
       prepare_confs ${arch} ${flavor}
     done
   done
-  
+
+  # No parallelization for mips.  Its too hard on the cpu!
   for arch in mipsel3; do
     for flavor in vanilla; do
       do_stages ${arch} ${flavor}
-      ret=$?
-      if [[ $? == 1 ]]; then
-         echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-         return 1
-      fi
+      [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
     done
   done
 }


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2014-08-18 21:59 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2014-08-18 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     7a409c03109130434ba21874038fc3242f2dc0f9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 22:45:11 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 22:45:11 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=7a409c03

tools-musl/run.sh: parallelize musl run

---
 tools-musl/run.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 84609aa..7f82a8e 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -43,19 +43,19 @@ main() {
   catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
   for arch in amd64 i686; do
-    for flavor in vanilla hardened; do
+    for flavor in hardened vanilla; do
       prepare_confs ${arch} ${flavor}
     done
   done
-  
+
+  # The parallelization `( do_stages ... ) &` doesn't work here
+  # if catalyst is using snapcache, bug #519656
   for arch in amd64 i686; do
-    for flavor in vanilla hardened; do
-      do_stages ${arch} ${flavor}
-      ret=$?
-      if [[ $? == 1 ]]; then
-         echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-         return 1
-      fi
+    for flavor in hardened vanilla; do
+      (
+        do_stages ${arch} ${flavor}
+        [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
+      ) &
     done
   done
 }


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2014-08-18 21:59 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2014-08-18 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     5dd1c99047e1385356fcce0b6f00c3a5f72f0f35
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 13 14:30:43 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 13 14:30:43 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=5dd1c990

tools-musl: fix error handling for failed stage

---
 tools-musl/run-armv7a.sh  |  9 +++------
 tools-musl/run-mipsel3.sh | 10 +++-------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index ad4fa3a..29c1fbf 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -51,15 +51,12 @@ main() {
       prepare_confs ${arch} ${flavor}
     done
   done
-  
+
+  # No parallelization for arm.  Its too hard on the cpu!
   for arch in armv7a_hardfp; do
     for flavor in hardened vanilla; do
       do_stages ${arch} ${flavor}
-      ret=$?
-      if [[ $? == 1 ]]; then
-         echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-         return 1
-      fi
+      [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
     done
   done
 }

diff --git a/tools-musl/run-mipsel3.sh b/tools-musl/run-mipsel3.sh
index 3d70505..50e5d57 100755
--- a/tools-musl/run-mipsel3.sh
+++ b/tools-musl/run-mipsel3.sh
@@ -33,7 +33,6 @@ prepare_confs() {
 }
 
 
-
 main() {
   >zzz.log
 
@@ -44,15 +43,12 @@ main() {
       prepare_confs ${arch} ${flavor}
     done
   done
-  
+
+  # No parallelization for mips.  Its too hard on the cpu!
   for arch in mipsel3; do
     for flavor in vanilla; do
       do_stages ${arch} ${flavor}
-      ret=$?
-      if [[ $? == 1 ]]; then
-         echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-         return 1
-      fi
+      [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
     done
   done
 }


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2015-01-20 23:38 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2015-01-20 23:38 UTC (permalink / raw
  To: gentoo-commits

commit:     a90463f45c0bb83fdbda7b68da015debc2deb159
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 20 23:39:52 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jan 20 23:39:52 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=a90463f4

tools-musl: use -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard for armv7a_hardpfp musl

---
 tools-musl/run-armv7a.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index 29c1fbf..f2ff4a0 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -35,6 +35,9 @@ prepare_confs() {
     sed -i "/^portage_confdir/s:_hardfp::" \
       stage${s}-${arch}-musl-${flavor}.conf
 
+    echo "cflags: -O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" >> \
+      stage${s}-${arch}-musl-${flavor}.conf
+
   done
 
   sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2015-06-14 21:01 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2015-06-14 21:01 UTC (permalink / raw
  To: gentoo-commits

commit:     7639bead240dd9125eae47c9f35a3e7269603c76
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 21:03:31 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 21:03:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=7639bead

tools-musl: fix when portage_confdir is missing.

 tools-musl/run-armv7a.sh           | 4 ++++
 tools-musl/run-mips32r2.sh         | 5 +++++
 tools-musl/run-mipsel3.sh          | 5 +++++
 tools-musl/run-ppc.sh              | 5 +++++
 tools-musl/run.sh                  | 5 +++++
 tools-musl/stage-all.conf.template | 2 +-
 6 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index f2ff4a0..6892f2f 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -38,6 +38,10 @@ prepare_confs() {
     echo "cflags: -O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" >> \
       stage${s}-${arch}-musl-${flavor}.conf
 
+    portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
+      | sed -e 's/^.*://')
+    [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
+      stage${s}-${arch}-musl-${flavor}.conf
   done
 
   sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf

diff --git a/tools-musl/run-mips32r2.sh b/tools-musl/run-mips32r2.sh
index 07d5778..0818361 100755
--- a/tools-musl/run-mips32r2.sh
+++ b/tools-musl/run-mips32r2.sh
@@ -27,6 +27,11 @@ prepare_confs() {
         -e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \
         -e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \
         >  stage${s}-${arch}-musl-${flavor}.conf
+
+    portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
+      | sed -e 's/^.*://')
+    [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
+      stage${s}-${arch}-musl-${flavor}.conf
   done
 
   sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf

diff --git a/tools-musl/run-mipsel3.sh b/tools-musl/run-mipsel3.sh
index 50e5d57..51c6753 100755
--- a/tools-musl/run-mipsel3.sh
+++ b/tools-musl/run-mipsel3.sh
@@ -27,6 +27,11 @@ prepare_confs() {
         -e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \
         -e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \
         >  stage${s}-${arch}-musl-${flavor}.conf
+
+    portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
+      | sed -e 's/^.*://')
+    [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
+      stage${s}-${arch}-musl-${flavor}.conf
   done
 
   sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf

diff --git a/tools-musl/run-ppc.sh b/tools-musl/run-ppc.sh
index 4294391..bb51672 100755
--- a/tools-musl/run-ppc.sh
+++ b/tools-musl/run-ppc.sh
@@ -27,6 +27,11 @@ prepare_confs() {
         -e "s:FLAVOR:${flavor}:g" \
         -e "s:MYCATALYST:$(pwd):g" \
         >  stage${s}-${arch}-musl-${flavor}.conf
+
+    portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
+      | sed -e 's/^.*://')
+    [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
+      stage${s}-${arch}-musl-${flavor}.conf
   done
 
   sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 7f82a8e..17d883b 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -29,6 +29,11 @@ prepare_confs() {
         -e "s:FLAVOR:${flavor}:g" \
         -e "s:MYCATALYST:$(pwd):g" \
         >  stage${s}-${arch}-musl-${flavor}.conf
+
+    portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
+      | sed -e 's/^.*://')
+    [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
+      stage${s}-${arch}-musl-${flavor}.conf
   done
 
   sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf

diff --git a/tools-musl/stage-all.conf.template b/tools-musl/stage-all.conf.template
index d7dab4b..942b02b 100644
--- a/tools-musl/stage-all.conf.template
+++ b/tools-musl/stage-all.conf.template
@@ -9,4 +9,4 @@ chost: TARCH-gentoo-linux-musl
 cflags: -O2 -pipe -fomit-frame-pointer
 cxxflags: -O2 -pipe -fomit-frame-pointer
 portage_confdir: MYCATALYST/portage.SARCH.FLAVOR
-portage_overlay: /var/lib/layman/hardened-development-musl
+portage_overlay: /var/lib/layman/musl


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2015-06-14 21:32 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2015-06-14 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ba06ecd17cc85c5d7828f94116c1ce349e270307
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 21:34:32 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 21:34:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=ba06ecd1

tools-musl: trim whitespace.

 tools-musl/run-armv7a.sh   | 2 +-
 tools-musl/run-mips32r2.sh | 2 +-
 tools-musl/run-mipsel3.sh  | 2 +-
 tools-musl/run-ppc.sh      | 2 +-
 tools-musl/run.sh          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index 6892f2f..bdb4af5 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -39,7 +39,7 @@ prepare_confs() {
       stage${s}-${arch}-musl-${flavor}.conf
 
     portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
-      | sed -e 's/^.*://')
+      | sed -e 's/^.*:[ \t]*//')
     [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
       stage${s}-${arch}-musl-${flavor}.conf
   done

diff --git a/tools-musl/run-mips32r2.sh b/tools-musl/run-mips32r2.sh
index 0818361..14f6c1a 100755
--- a/tools-musl/run-mips32r2.sh
+++ b/tools-musl/run-mips32r2.sh
@@ -29,7 +29,7 @@ prepare_confs() {
         >  stage${s}-${arch}-musl-${flavor}.conf
 
     portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
-      | sed -e 's/^.*://')
+      | sed -e 's/^.*:[ \t]*//')
     [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
       stage${s}-${arch}-musl-${flavor}.conf
   done

diff --git a/tools-musl/run-mipsel3.sh b/tools-musl/run-mipsel3.sh
index 51c6753..f785b29 100755
--- a/tools-musl/run-mipsel3.sh
+++ b/tools-musl/run-mipsel3.sh
@@ -29,7 +29,7 @@ prepare_confs() {
         >  stage${s}-${arch}-musl-${flavor}.conf
 
     portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
-      | sed -e 's/^.*://')
+      | sed -e 's/^.*:[ \t]*//')
     [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
       stage${s}-${arch}-musl-${flavor}.conf
   done

diff --git a/tools-musl/run-ppc.sh b/tools-musl/run-ppc.sh
index bb51672..9580bac 100755
--- a/tools-musl/run-ppc.sh
+++ b/tools-musl/run-ppc.sh
@@ -29,7 +29,7 @@ prepare_confs() {
         >  stage${s}-${arch}-musl-${flavor}.conf
 
     portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
-      | sed -e 's/^.*://')
+      | sed -e 's/^.*:[ \t]*//')
     [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
       stage${s}-${arch}-musl-${flavor}.conf
   done

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 17d883b..cbd9b87 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -31,7 +31,7 @@ prepare_confs() {
         >  stage${s}-${arch}-musl-${flavor}.conf
 
     portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
-      | sed -e 's/^.*://')
+      | sed -e 's/^.*:[ \t]*//')
     [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
       stage${s}-${arch}-musl-${flavor}.conf
   done


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2015-12-07  0:54 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2015-12-07  0:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2fd64cda9694f5d29882965d2f29367a3b5f7f1d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 01:01:41 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 01:01:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=2fd64cda

tools-musl: drop redudant -fomit-frame-pointers

 tools-musl/stage-all.conf.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-musl/stage-all.conf.template b/tools-musl/stage-all.conf.template
index 942b02b..9a3fdfc 100644
--- a/tools-musl/stage-all.conf.template
+++ b/tools-musl/stage-all.conf.template
@@ -6,7 +6,7 @@ profile: hardened/linux/musl/PARCH
 snapshot: current
 source_subpath: musl/FLAVOR/SARCH/PSTAGE-SARCH-musl-FLAVOR
 chost: TARCH-gentoo-linux-musl
-cflags: -O2 -pipe -fomit-frame-pointer
-cxxflags: -O2 -pipe -fomit-frame-pointer
+cflags: -O2 -pipe
+cxxflags: -O2 -pipe
 portage_confdir: MYCATALYST/portage.SARCH.FLAVOR
 portage_overlay: /var/lib/layman/musl


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2016-06-04 16:07 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2016-06-04 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     1ae8501b23c69338c3e9b25660ce7fde51f79e4c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  4 16:09:00 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jun  4 16:09:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=1ae8501b

tools-musl/run.sh: restore code accidentally removed

 tools-musl/run.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index e84e6a6..cbd9b87 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -52,6 +52,17 @@ main() {
       prepare_confs ${arch} ${flavor}
     done
   done
+
+  # The parallelization `( do_stages ... ) &` doesn't work here
+  # if catalyst is using snapcache, bug #519656
+  for arch in amd64 i686; do
+    for flavor in hardened vanilla; do
+      (
+        do_stages ${arch} ${flavor}
+        [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
+      ) &
+    done
+  done
 }
 
 main $1 &


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2017-01-02  4:08 Matt Thode
  0 siblings, 0 replies; 26+ messages in thread
From: Matt Thode @ 2017-01-02  4:08 UTC (permalink / raw
  To: gentoo-commits

commit:     e4c5f54040c841efd9b3ff1c8cc7d17e187fbd0d
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Jan  2 04:07:30 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 04:07:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=e4c5f540

fix stage4-hardened-amd64.spec for musl

 tools-musl/stage4-hardened-amd64.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec
index e8b30e9..92d85b9 100644
--- a/tools-musl/stage4-hardened-amd64.spec
+++ b/tools-musl/stage4-hardened-amd64.spec
@@ -38,7 +38,7 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 	sys-process/cronie
-stage4/fsscript: /root/releng/tools-musl/tools-musl/stage4-fsscript.sh
+stage4/fsscript: @REPO_DIR@/stage4-fsscript.sh
 stage4/rcadd:
 	acpid|default
 	cronie|default
@@ -56,7 +56,6 @@ boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules --makeopts=-j4
 
 # all of the cleanup...
 stage4/unmerge:
-	sys-kernel/genkernel
 	sys-kernel/hardened-sources
 
 stage4/empty:


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2017-01-02  4:21 Matt Thode
  0 siblings, 0 replies; 26+ messages in thread
From: Matt Thode @ 2017-01-02  4:21 UTC (permalink / raw
  To: gentoo-commits

commit:     dd3a001c4d35ff97e0056bd79a6ec0763f2c6f05
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Jan  2 04:18:38 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 04:18:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=dd3a001c

remove stage4/unmerge

seems that it causes issues on rebuilds, if the kernel is cached it will
not emerge some packages (like kernels)

WARNING: A requested package will not be merged because it is listed in
package.provided:

  hardened-sources pulled in by 'args'

 tools-musl/stage4-hardened-amd64.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec
index 92d85b9..6cab281 100644
--- a/tools-musl/stage4-hardened-amd64.spec
+++ b/tools-musl/stage4-hardened-amd64.spec
@@ -54,10 +54,6 @@ boot/kernel/gentoo/config: @REPO_DIR@/../releases/weekly/kconfig/amd64/admincd-4
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules --makeopts=-j4
 
-# all of the cleanup...
-stage4/unmerge:
-	sys-kernel/hardened-sources
-
 stage4/empty:
 	/root/.ccache
 	/tmp


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2017-01-02  4:30 Matt Thode
  0 siblings, 0 replies; 26+ messages in thread
From: Matt Thode @ 2017-01-02  4:30 UTC (permalink / raw
  To: gentoo-commits

commit:     dbda57e562be6391ea6b23cb2fcef40981166856
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Jan  2 04:29:52 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 04:29:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=dbda57e5

make the stage4 musl version_stamp make more sense

 tools-musl/stage4-hardened-amd64.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec
index 6cab281..33b6e77 100644
--- a/tools-musl/stage4-hardened-amd64.spec
+++ b/tools-musl/stage4-hardened-amd64.spec
@@ -1,6 +1,6 @@
 subarch: amd64
 target: stage4
-version_stamp: cloud-latest
+version_stamp: hardened-musl-cloud-latest
 rel_type: default
 profile: hardened/linux/musl/amd64
 snapshot: current


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2017-01-02 23:59 Matt Thode
  0 siblings, 0 replies; 26+ messages in thread
From: Matt Thode @ 2017-01-02 23:59 UTC (permalink / raw
  To: gentoo-commits

commit:     e2f7055e0cb7d58ccb600e5e0d2574d453c3f47c
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Jan  2 23:57:00 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 23:57:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=e2f7055e

use cloud kernel config for building musl stage4 (it actually boots)

 tools-musl/stage4-hardened-amd64.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec
index 33b6e77..2640dcd 100644
--- a/tools-musl/stage4-hardened-amd64.spec
+++ b/tools-musl/stage4-hardened-amd64.spec
@@ -50,7 +50,7 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: @REPO_DIR@/../releases/weekly/kconfig/amd64/admincd-4.4.8-r1.config
+boot/kernel/gentoo/config: @REPO_DIR@/../releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules --makeopts=-j4
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2017-01-03  3:01 Matt Thode
  0 siblings, 0 replies; 26+ messages in thread
From: Matt Thode @ 2017-01-03  3:01 UTC (permalink / raw
  To: gentoo-commits

commit:     d7b9e890893c9538316baa668138942f7af77ad9
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Jan  3 03:00:30 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 03:00:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=d7b9e890

use new genkernel option, needed to build on musl

 tools-musl/stage4-hardened-amd64.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec
index 2640dcd..e4623cb 100644
--- a/tools-musl/stage4-hardened-amd64.spec
+++ b/tools-musl/stage4-hardened-amd64.spec
@@ -52,7 +52,7 @@ boot/kernel: gentoo
 boot/kernel/gentoo/sources: hardened-sources
 boot/kernel/gentoo/config: @REPO_DIR@/../releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
 boot/kernel/gentoo/extraversion: openstack
-boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules --makeopts=-j4
+boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules --no-nfs --makeopts=-j4
 
 stage4/empty:
 	/root/.ccache


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2017-01-05  5:41 Matt Thode
  0 siblings, 0 replies; 26+ messages in thread
From: Matt Thode @ 2017-01-05  5:41 UTC (permalink / raw
  To: gentoo-commits

commit:     6d7033cf8a64abf1dee577461bcfdf4e368a4640
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Thu Jan  5 05:41:11 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 05:41:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=6d7033cf

fixing spaces/tabs

 tools-musl/stage4-hardened-amd64.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec
index aae24bf..a40c015 100644
--- a/tools-musl/stage4-hardened-amd64.spec
+++ b/tools-musl/stage4-hardened-amd64.spec
@@ -21,7 +21,7 @@ stage4/use:
 
 stage4/packages:
 	app-admin/syslog-ng
-  dev-util/pkgconf
+	dev-util/pkgconf
 	net-misc/dhcpcd
 	sys-apps/iproute2
 	sys-devel/bc
@@ -48,7 +48,7 @@ stage4/empty:
 	/tmp
 	/usr/portage/distfiles
 	/usr/src
-  /var/cache
+	/var/cache
 	/var/empty
 	/var/run
 	/var/state


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2018-03-02 16:25 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2018-03-02 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     7df123192045450131da1073580bfc3ee6c3ce20
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  2 16:24:52 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 16:24:52 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=7df12319

tools-musl: use the new musl profiles

 tools-musl/run.sh              | 14 ++++++++------
 tools-musl/stage.conf.template | 12 ++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index cda71d0f..9140ac35 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -20,9 +20,9 @@ prepare_confs() {
     [[ "${arch}" == "amd64" ]] && tarch="x86_64"
 
     local profile=${flavor}
-    [[ "${flavor}" == "vanilla" ]] && profile="default"
+    [[ "${flavor}" == "vanilla" ]] && profile="" || profile="/hardened"
 
-    cat stage-all.conf.template | \
+    cat stage.conf.template | \
       sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
         -e "s:CSTAGE:${cstage}:g" \
         -e "s:PSTAGE:${pstage}:g" \
@@ -61,10 +61,12 @@ main() {
   # if catalyst is using snapcache, bug #519656
   for arch in amd64 i686; do
     for flavor in hardened vanilla; do
-      (
-        do_stages ${arch} ${flavor}
-        [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-      ) &
+      do_stages ${arch} ${flavor}
+      [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
+#      (
+#        do_stages ${arch} ${flavor}
+#        [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
+#      ) &
     done
   done
 }

diff --git a/tools-musl/stage.conf.template b/tools-musl/stage.conf.template
new file mode 100644
index 00000000..38ac1adf
--- /dev/null
+++ b/tools-musl/stage.conf.template
@@ -0,0 +1,12 @@
+subarch: SARCH
+target: CSTAGE
+version_stamp: musl-FLAVOR
+rel_type: musl/FLAVOR/SARCH
+profile: default/linux/PARCH/17.0/muslPROFILE
+snapshot: current
+source_subpath: musl/FLAVOR/SARCH/PSTAGE-SARCH-musl-FLAVOR
+chost: TARCH-gentoo-linux-musl
+cflags: -O2 -pipe
+cxxflags: -O2 -pipe
+portage_confdir: MYCATALYST/portage.SARCH.FLAVOR
+portage_overlay: /var/lib/layman/musl


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2019-04-11  1:37 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2019-04-11  1:37 UTC (permalink / raw
  To: gentoo-commits

commit:     189b629168125b18eb66ae3ff20f9379ddb08573
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 00:30:17 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 01:37:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=189b6291

tools-musl: improve armv7a/arm64 scripts

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 tools-musl/run-arm64.sh  | 16 +++++++---------
 tools-musl/run-armv7a.sh | 38 ++++++++++++--------------------------
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/tools-musl/run-arm64.sh b/tools-musl/run-arm64.sh
index af6d49bd..200b33de 100755
--- a/tools-musl/run-arm64.sh
+++ b/tools-musl/run-arm64.sh
@@ -6,6 +6,8 @@ prepare_confs() {
   local flavor=$1
   local arch="arm64"
   local tarch="aarch64"
+  local profile="default/linux/arm64/17.0/musl"
+  [[ "${flavor}" == "hardened" ]] && profile="${profile}/hardened"
 
   for s in 1 2 3; do
     local cstage=stage${s}
@@ -13,9 +15,6 @@ prepare_confs() {
     [[ $p == 0 ]] && p=3
     local pstage=stage${p}
 
-    local profile="default/linux/arm64/17.0/musl"
-    [[ "${flavor}" == "hardened" ]] && profile="${profile}/hardened"
-
     cat stage.conf.template | \
       sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
         -e "s:CSTAGE:${cstage}:g" \
@@ -43,17 +42,16 @@ prepare_confs() {
 main() {
   >zzz.log
 
-#  catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
+  catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
   for flavor in hardened vanilla; do
     prepare_confs ${flavor}
   done
 
-  # No parallelization for arm64.  Its too hard on the cpu!
-#  for flavor in hardened vanilla; do
-#    do_stages ${flavor}
-#    [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-#  done
+  for flavor in hardened vanilla; do
+    do_stages ${flavor}
+    [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
+  done
 }
 
 main $1 &

diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index bec98577..bf5bd753 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -3,36 +3,27 @@
 source common.sh
 
 prepare_confs() {
-  local arch=$1
-  local flavor=$2
+  local flavor=$1
+  local arch="armv7a_hardfp"
+  local tarch="armv7a"
+  local profile="default/linux/arm/17.0/musl/armv7a"
+  [[ "${flavor}" == "hardened" ]] && profile="${profile}/hardened"
 
   for s in 1 2 3; do
-
     local cstage=stage${s}
     local p=$(( s - 1 ))
     [[ $p == 0 ]] && p=3
     local pstage=stage${p}
-    local tarch="${arch%_hardfp}"
-    local parch="arm/${tarch}"
-    local float
-
-    [[ "${arch}" == "${tarch}" ]] \
-      && float="softfp" \
-      || float="hardfloat"
-
-    local profile=${flavor}
-    [[ "${flavor}" == "vanilla" ]] && profile="default"
 
     cat stage.conf.template | \
       sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
         -e "s:CSTAGE:${cstage}:g" \
         -e "s:PSTAGE:${pstage}:g" \
         -e "s:SARCH:${arch}:g" \
-        -e "s:PARCH:${parch}:g" \
         -e "s:TARCH:${tarch}:g" \
-        -e "s:gentoo-linux-musl:${float}-linux-musleabi:" \
         -e "s:FLAVOR:${flavor}:g" \
-        -e "s:PROFILE:${profile}:g" \
+        -e "s:gentoo-linux-musl:hardfloat-linux-musleabi:" \
+        -e "s:^profile\:.*:profile\: ${profile}:" \
         -e "s:MYCATALYST:$(pwd):g" \
         >  stage${s}-${arch}-musl-${flavor}.conf
 
@@ -57,18 +48,13 @@ main() {
 
   catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
-  for arch in armv7a_hardfp; do
-    for flavor in hardened vanilla; do
-      prepare_confs ${arch} ${flavor}
-    done
+  for flavor in hardened vanilla; do
+    prepare_confs ${flavor}
   done
 
-  # No parallelization for arm.  Its too hard on the cpu!
-  for arch in armv7a_hardfp; do
-    for flavor in hardened vanilla; do
-      do_stages ${arch} ${flavor}
-      [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
-    done
+  for flavor in hardened vanilla; do
+    do_stages ${flavor}
+    [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
   done
 }
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2019-04-13 10:54 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2019-04-13 10:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2ebfa50ee3ca5bed1f32046d363551acb95f042a
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 10:54:07 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 10:54:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=2ebfa50e

tools-musl: fix do_stage(), see commit 189b6291

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 tools-musl/run-arm64.sh  | 2 +-
 tools-musl/run-armv7a.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-musl/run-arm64.sh b/tools-musl/run-arm64.sh
index 200b33de..6b20710f 100755
--- a/tools-musl/run-arm64.sh
+++ b/tools-musl/run-arm64.sh
@@ -49,7 +49,7 @@ main() {
   done
 
   for flavor in hardened vanilla; do
-    do_stages ${flavor}
+    do_stages "arm64" ${flavor}
     [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
   done
 }

diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index bf5bd753..35f14193 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -53,7 +53,7 @@ main() {
   done
 
   for flavor in hardened vanilla; do
-    do_stages ${flavor}
+    do_stages "armv7a_hardfp" ${flavor}
     [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
   done
 }


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2019-05-24  3:50 Matthew Thode
  0 siblings, 0 replies; 26+ messages in thread
From: Matthew Thode @ 2019-05-24  3:50 UTC (permalink / raw
  To: gentoo-commits

commit:     96fc8a991b72df2bec314ea15a39c65691612a59
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri May 24 03:50:12 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri May 24 03:50:12 2019 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=96fc8a99

new musl stage4 uses xz

 tools-musl/run-stage4.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-musl/run-stage4.sh b/tools-musl/run-stage4.sh
index 5bfe74e6..2a5263bb 100755
--- a/tools-musl/run-stage4.sh
+++ b/tools-musl/run-stage4.sh
@@ -16,8 +16,8 @@ sed -i "s|MY_DATE|${MY_DATE}|g" "${MUSL_DIR}"/stage4-hardened-amd64-configured.s
 catalyst -f "${MUSL_DIR}"/stage4-hardened-amd64-configured.spec | tee -a "${MUSL_DIR}"/zzz.log
 
 # update link, rm -f returns 0 if file isn't there yet
-rm -f "${storedir}/builds/musl/hardened/amd64/stage4-amd64-musl-hardened.tar.bz2"
-ln -s "${storedir}/builds/musl/hardened/amd64/stage4-amd64-musl-hardened-${MY_DATE}.tar.bz2" "${storedir}/builds/musl/hardened/amd64/stage4-amd64-musl-hardened.tar.bz2"
+rm -f "${storedir}/builds/musl/hardened/amd64/stage4-amd64-musl-hardened.tar.xz"
+ln -s "${storedir}/builds/musl/hardened/amd64/stage4-amd64-musl-hardened-${MY_DATE}.tar.xz" "${storedir}/builds/musl/hardened/amd64/stage4-amd64-musl-hardened.tar.xz"
 
 # remove old specfile
 rm "${MUSL_DIR}"/stage4-hardened-amd64-configured.spec


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] proj/releng:master commit in: tools-musl/
@ 2020-01-14 19:11 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2020-01-14 19:11 UTC (permalink / raw
  To: gentoo-commits

commit:     a51e97106fa21078f6f81505274b8a86c6fcc364
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 19:10:55 2020 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 19:10:55 2020 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=a51e9710

tools-musl: change CHOST for armv7a

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 tools-musl/run-armv7a.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index 35f14193..12c16569 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -22,7 +22,7 @@ prepare_confs() {
         -e "s:SARCH:${arch}:g" \
         -e "s:TARCH:${tarch}:g" \
         -e "s:FLAVOR:${flavor}:g" \
-        -e "s:gentoo-linux-musl:hardfloat-linux-musleabi:" \
+        -e "s:gentoo-linux-musl:unknown-linux-musleabihf:g" \
         -e "s:^profile\:.*:profile\: ${profile}:" \
         -e "s:MYCATALYST:$(pwd):g" \
         >  stage${s}-${arch}-musl-${flavor}.conf


^ permalink raw reply related	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2020-01-14 19:11 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-07  0:54 [gentoo-commits] proj/releng:master commit in: tools-musl/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2020-01-14 19:11 Anthony G. Basile
2019-05-24  3:50 Matthew Thode
2019-04-13 10:54 Anthony G. Basile
2019-04-11  1:37 Anthony G. Basile
2018-03-02 16:25 Anthony G. Basile
2017-01-05  5:41 Matt Thode
2017-01-03  3:01 Matt Thode
2017-01-02 23:59 Matt Thode
2017-01-02  4:30 Matt Thode
2017-01-02  4:21 Matt Thode
2017-01-02  4:08 Matt Thode
2016-06-04 16:07 Anthony G. Basile
2015-06-14 21:32 Anthony G. Basile
2015-06-14 21:01 Anthony G. Basile
2015-01-20 23:38 Anthony G. Basile
2014-08-18 21:59 Robin H. Johnson
2014-08-18 21:59 Robin H. Johnson
2014-08-13 14:28 Anthony G. Basile
2014-08-11 22:43 Anthony G. Basile
2014-06-28 10:43 Anthony G. Basile
2014-06-18 11:14 Anthony G. Basile
2014-02-18 21:04 Anthony G. Basile
2014-02-06 13:06 Anthony G. Basile
2014-02-05 20:13 Anthony G. Basile
2014-02-05 20:11 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