summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-03-03 18:01:49 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-03-03 18:01:49 +0100
commit23ee1a2c83a8c3443f5086c30619856046b77158 (patch)
tree24926cfca287212d97ad82dfb8c4192eed9754e5 /libre
parent6be2fb84fedb0602286ac30ce807d2894a189a9b (diff)
More linux-libre build fixes.
Diffstat (limited to 'libre')
-rw-r--r--libre/linux-libre/PKGBUILD9
1 files changed, 6 insertions, 3 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index f31815bb3..b72066ccd 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -101,7 +101,7 @@ build() {
-e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
-e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \
- -e "s|(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*|\1=y|g"
+ -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
./.config
else
cat "${srcdir}/config.${CARCH}" > ./.config # simpler
@@ -136,6 +136,9 @@ build() {
# build!
if [ "$CARCH" == "mips64el" ]; then
+ # The build system passes it directly to linker, disable to avoid
+ # having unknown -Wl,... options.
+ export LDFLAGS=""
# bzImage is arch-specific and not supported on mips; vmlinux is
# useful for oprofile.
make ${MAKEFLAGS} vmlinux vmlinuz modules
@@ -226,7 +229,7 @@ package_linux-libre-headers() {
# In case of repackaging this is empty
if [ -z "${_kernver}" ]; then
- cd ${srcdir}/linux-$pkgver
+ cd "${srcdir}/linux-${_basekernel}"
_kernver="$(make kernelrelease)"
fi
@@ -260,7 +263,7 @@ package_linux-libre-headers() {
if [ "$CARCH" = "mips64el" ]; then
cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
- cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+ cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
fi