Changeset 516


Ignore:
Timestamp:
Jun 26, 2013, 10:39:53 PM (6 years ago)
Author:
amain
Message:

Fix various small build issues

Location:
branches/contrib
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/debian/package/broadcom-wl/build.sh

    r276 r516  
    1616VERSION=1
    1717RELEASE=1
    18 DOWNLOAD_URL=svn://svn.openwrt.org/openwrt/trunk/package/${PACKAGE}
     18DOWNLOAD_URL=svn://svn.openwrt.org/openwrt/trunk/package/kernel/${PACKAGE}
    1919DEP=
    2020
  • branches/contrib/debian/package/debian.mk

    r323 r516  
    3030# include $(TOPDIR)/debian/package/nzbget/build.mk
    3131include $(TOPDIR)/debian/package/libnl-tiny/build.mk
    32 include $(TOPDIR)/debian/package/swconfig/build.mk
     32# include $(TOPDIR)/debian/package/swconfig/build.mk
    3333# include $(TOPDIR)/debian/package/led/build.mk
    3434include $(TOPDIR)/debian/package/broadcom-wl/build.mk
  • branches/contrib/debian/package/hostapd/build.sh

    r440 r516  
    4444
    4545# download madwifi from openwrt, to determine which madwifi version to use
    46 DOWNLOAD_URL3=svn://svn.openwrt.org/openwrt/trunk/package/madwifi
    47 mkdir -p ${BUILD_DIR}/src/madwifi
    48 svn checkout ${DOWNLOAD_URL3} ${BUILD_DIR}/src/madwifi | tail -n 3
    49 
    50 # download correct version from madwifi
    51 REV=`cat ${BUILD_DIR}/src/madwifi/Makefile  | grep ^PKG_REV | awk -F ":=" '{print $2}'`
    52 OPENWRT_VERSION="r${REV:=3314}"
    53 PACKAGE_SOURCE=madwifi-trunk-${OPENWRT_VERSION}.tar.gz
    54 DOWNLOAD_URL4=http://mirror2.openwrt.org/sources/${PACKAGE_SOURCE}
    55 
    56 if [ ! -s ${DOWNLOAD_DIR}/${PACKAGE_SOURCE} ]; then rm -f ${DOWNLOAD_DIR}/${PACKAGE_SOURCE}; wget -O ${DOWNLOAD_DIR}/${PACKAGE_SOURCE} $DOWNLOAD_URL4; fi
    57 tar xzf ${DOWNLOAD_DIR}/${PACKAGE_SOURCE} -C ${BUILD_DIR}/src/madwifi --strip 1
     46# apparantly madwifi has been depricated by openwrt. Hostapd does not appear
     47# to need madwifi sources anymore
     48# DOWNLOAD_URL3=svn://svn.openwrt.org/openwrt/trunk/package/madwifi
     49# mkdir -p ${BUILD_DIR}/src/madwifi
     50# svn checkout ${DOWNLOAD_URL3} ${BUILD_DIR}/src/madwifi | tail -n 3
     51#
     52## download correct version from madwifi
     53#REV=`cat ${BUILD_DIR}/src/madwifi/Makefile  | grep ^PKG_REV | awk -F ":=" '{print $2}'`
     54#OPENWRT_VERSION="r${REV:=3314}"
     55#PACKAGE_SOURCE=madwifi-trunk-${OPENWRT_VERSION}.tar.gz
     56#DOWNLOAD_URL4=http://mirror2.openwrt.org/sources/${PACKAGE_SOURCE}
     57#
     58#if [ ! -s ${DOWNLOAD_DIR}/${PACKAGE_SOURCE} ]; then rm -f ${DOWNLOAD_DIR}/${PACKAGE_SOURCE}; wget -O ${DOWNLOAD_DIR}/${PACKAGE_SOURCE} $DOWNLOAD_URL4; fi
     59#tar xzf ${DOWNLOAD_DIR}/${PACKAGE_SOURCE} -C ${BUILD_DIR}/src/madwifi --strip 1
    5860
    5961# cp config file
  • branches/contrib/debian/package/hostapd/debian/rules

    r321 r516  
    4242        dh_auto_configure
    4343
    44         $(MAKE) -C src/hostapd
     44        @# disable OpenWrt's ubus system tools support
     45        @# alternatively this could als be disabled from build.sh
     46        $(MAKE) -C src/hostapd CONFIG_UBUS=''
    4547
    4648        dh_auto_test
  • branches/contrib/debian/package/hostapd/patches/001_fix_GNU_compile_and_header_include.diff

    r265 r516  
    1 
    2 This patch was added May 2011
    3 to get a clean (cross) compile for DebWRT
    4 
    5 --- src/src/crypto/random.c.org 2011-05-18 21:02:03.473156872 +0000
    6 +++ src/src/crypto/random.c     2011-05-18 21:03:44.833305532 +0000
    7 @@ -30,7 +30,9 @@
     1--- src/src/crypto/random.org   2013-06-26 06:35:09.004352542 +0000
     2+++ src/src/crypto/random.c     2013-06-26 06:35:28.720353802 +0000
     3@@ -24,6 +24,7 @@
    84 
    95 #include "utils/includes.h"
     
    117+#define __USE_GNU
    128 #include <fcntl.h>
    13 +#include <sys/stat.h>
     9 #include <sys/stat.h>
    1410 #endif /* __linux__ */
    15  
    16  #include "utils/common.h"
  • branches/contrib/debian/package/iw/iw.sh

    r316 r516  
    1616PACKAGE_SOURCE=${PACKAGE}-${VERSION}.tar.bz2
    1717#DOWNLOAD_URL=http://wireless.kernel.org/download/iw/${PACKAGE_SOURCE}
    18 DOWNLOAD_URL=http://linuxwireless.org/download/iw/${PACKAGE_SOURCE}
     18#DOWNLOAD_URL=http://linuxwireless.org/download/iw/${PACKAGE_SOURCE}
     19DOWNLOAD_URL=http://www.kernel.org/pub/software/network/iw/${PACKAGE_SOURCE}
    1920DEP=
    2021
  • branches/contrib/debian/package/nvram/build.sh

    r84 r516  
    1616VERSION=1.0
    1717RELEASE=1
    18 DOWNLOAD_URL=svn://svn.openwrt.org/openwrt/trunk/package/nvram
     18DOWNLOAD_URL=svn://svn.openwrt.org/openwrt/trunk/package/utils/nvram
    1919DEP=
    2020
  • branches/contrib/debian/package/robocfg/build.sh

    r293 r516  
    1616VERSION=1.0.1
    1717RELEASE=1
    18 DOWNLOAD_URL=svn://svn.openwrt.org/openwrt/trunk/package/robocfg
     18DOWNLOAD_URL=svn://svn.openwrt.org/openwrt/trunk/package/utils/robocfg
    1919DEP=
    2020
  • branches/contrib/openwrt/patches/trunk/030_fix_kernel_build_xargs.patch

    r515 r516  
    22===================================================================
    33--- /dev/null   1970-01-01 00:00:00.000000000 +0000
    4 +++ target/linux/generic/patches-3.8/001-headersinst-xargs.patch        2013-03-11 12:37:13.242674742 +0100
     4+++ openwrt/target/linux/generic/patches-3.8/001-headersinst-xargs.patch        2013-03-11 12:37:13.242674742 +0100
    55@@ -0,0 +1,21 @@
    66+--- a/scripts/Makefile.headersinst     2013-03-11 12:04:39.034212322 +0100
  • branches/contrib/rules/users.mk

    r279 r516  
    66#
    77amain: .config
    8         sed -i 's!CONFIG_DEBIAN_BUILDENV_REPOSITORY.*!CONFIG_DEBIAN_BUILDENV_REPOSITORY="http://10.0.2.3:3142/ftp.debian.org/debian"!' $(TOPDIR)/.config
    9         sed -i 's!CONFIG_EMDEBIAN_BUILDENV_REPOSITORY.*!CONFIG_EMDEBIAN_BUILDENV_REPOSITORY="http://10.0.2.3:3142/www.emdebian.org/debian"!' $(TOPDIR)/.config
    10         sed -i 's!CONFIG_OPENWRT_DOWNLOAD_DIR.*!CONFIG_OPENWRT_DOWNLOAD_DIR="../../../../dl"!' $(TOPDIR)/.config
     8        sed -i 's!CONFIG_DEBIAN_BUILDENV_REPOSITORY.*!CONFIG_DEBIAN_BUILDENV_REPOSITORY="http://10.0.2.10:3142/ftp.debian.nl/debian"!' $(TOPDIR)/.config
     9        sed -i 's!CONFIG_EMDEBIAN_BUILDENV_REPOSITORY.*!CONFIG_EMDEBIAN_BUILDENV_REPOSITORY="http://10.0.2.10:3142/www.emdebian.org/debian"!' $(TOPDIR)/.config
     10        sed -i 's!CONFIG_OPENWRT_DOWNLOAD_DIR.*!CONFIG_OPENWRT_DOWNLOAD_DIR="../../../dl"!' $(TOPDIR)/.config
    1111
    1212buildbot: .config
Note: See TracChangeset for help on using the changeset viewer.