summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2018-02-14 21:35:38 +0100
committerAndreas Grapentin <andreas@grapentin.org>2018-02-14 21:35:38 +0100
commit513e859c0d3d023fb7f499246aa5e562fa43f535 (patch)
tree2b7da36f018b0bd7db8dff9bd3668107a5468630
parentda45c587a0e996b874faa6e1e6e7d46934c66e99 (diff)
now at libcap-ng
-rw-r--r--src/stage1/ca-certificates-utils-shim.sh2
-rw-r--r--src/stage1/gcc-libs-shim.sh2
-rw-r--r--src/stage1/glibc-shim.sh2
-rw-r--r--src/stage1/patches/popt.patch13
4 files changed, 16 insertions, 3 deletions
diff --git a/src/stage1/ca-certificates-utils-shim.sh b/src/stage1/ca-certificates-utils-shim.sh
index dc2ddae..0b53b23 100644
--- a/src/stage1/ca-certificates-utils-shim.sh
+++ b/src/stage1/ca-certificates-utils-shim.sh
@@ -46,7 +46,7 @@ pkgver = $_pkgver
pkgdesc = Common CA certificates (utilities) - extracted from host machine
url = http://pkgs.fedoraproject.org/cgit/rpms/ca-certificates.git
builddate = $(date '+%s')
-size = $(( $(du -sk --apparent-size "$_pkgdir" | cut -d' ' -f1) * 1024 ))
+size = 0
arch = $_arch
provide = ${_pkgname%-*}
conflict = ${_pkgname%-*}
diff --git a/src/stage1/gcc-libs-shim.sh b/src/stage1/gcc-libs-shim.sh
index 3d1de3a..9acc9c5 100644
--- a/src/stage1/gcc-libs-shim.sh
+++ b/src/stage1/gcc-libs-shim.sh
@@ -46,7 +46,7 @@ pkgver = $_pkgver
pkgdesc = Runtime libraries shipped by GCC (extracted from $_target-gcc)
url = https://github.com/riscv/riscv-gnu-toolchain
builddate = $(date '+%s')
-size = $(( $(du -sk --apparent-size "$_pkgdir" | cut -d' ' -f1) * 1024 ))
+size = 0
arch = $_arch
provide = ${_pkgname%-*}
conflict = ${_pkgname%-*}
diff --git a/src/stage1/glibc-shim.sh b/src/stage1/glibc-shim.sh
index 561086a..e1259c6 100644
--- a/src/stage1/glibc-shim.sh
+++ b/src/stage1/glibc-shim.sh
@@ -55,7 +55,7 @@ pkgver = $_pkgver
pkgdesc = GNU C Library (extracted from $_target-glibc)
url = https://github.com/riscv/riscv-gnu-toolchain
builddate = $(date '+%s')
-size = $(( $(du -sk --apparent-size "$_pkgdir" | cut -d' ' -f1) * 1024 ))
+size = 0
arch = $_arch
provide = ${_pkgname%-*}
conflict = ${_pkgname%-*}
diff --git a/src/stage1/patches/popt.patch b/src/stage1/patches/popt.patch
new file mode 100644
index 0000000..5b20951
--- /dev/null
+++ b/src/stage1/patches/popt.patch
@@ -0,0 +1,13 @@
+--- a/PKGBUILD 2018-02-14 21:25:27.205059740 +0100
++++ b/PKGBUILD 2018-02-14 21:32:44.032635822 +0100
+@@ -15,7 +15,9 @@ sha1sums=('cfe94a15a2404db85858a81ff8de2
+
+ build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+- ./configure --prefix=/usr
++ curl "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
++ > config.sub
++ ./configure --host=@TARGET@ --prefix=/usr
+ make
+ }
+