Changeset 563


Ignore:
Timestamp:
Dec 5, 2013, 10:40:12 PM (6 years ago)
Author:
amain
Message:

debwrt: collection of changes to fix trunk build:

  • Fix debian/package/swconfig: wrong version of switch.h was installed
  • Fix dpkg-cross package naming conflicts since wheezy - check manually in build.sh instead of via package depends
  • Fix robocfg init script dependency error for wheezy
  • Fix debian/package/debwrt-hostapd: upstream moved to git repo
  • Rename hostapd to debwrt-hostapd to prevent collissions with original hostapd debian package
  • Show missing openwrt runtime env variables causing debian/package/debwrt-kernel-headers to fail
  • Check if debootstrap succeeded and abort instead of silent ignore
  • Lenny and Squeeze are now depricated for DebWrt trunk


Location:
trunk
Files:
18 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/config/debian_rootfs.in

    r517 r563  
    2222choice
    2323    prompt "DebWrt Debian Release"
    24         default DEBWRT_DEBIAN_RELEASE_SQUEEZE
     24        default DEBWRT_DEBIAN_RELEASE_WHEEZY
    2525        help
    2626          Select the the Debian release for the root filesystem. Also sets the build environment release.
     
    3636config DEBWRT_DEBIAN_RELEASE_SQUEEZE
    3737    bool
    38     prompt "Squeeze"
     38    prompt "Squeeze (depricated - may not work)"
    3939
    4040config DEBWRT_DEBIAN_RELEASE_LENNY
    4141    bool
    42     prompt "Lenny"
     42    prompt "Lenny (depricated - may not work)"
    4343
    4444endchoice
  • trunk/config/openwrt.defconfig

    r561 r563  
    204204CONFIG_PACKAGE_kmod-usb-printer=y
    205205
    206 # brcmsmac support
    207 CONFIG_PACKAGE_kmod-brcmfmac=y           
    208 CONFIG_PACKAGE_kmod-brcmutil=y           
    209 
     206# brcmf/smac support - will become modules not compiled into kernel
     207#CONFIG_PACKAGE_kmod-brcmfmac=y
     208#CONFIG_PACKAGE_kmod-brcmutil=y
     209#CONFIG_PACKAGE_kmod-lib-cordic=y
     210#CONFIG_PACKAGE_kmod-lib-crc8=y
     211#CONFIG_PACKAGE_kmod-brcmsmac=y
     212
  • trunk/debian/package/debian.mk

    r517 r563  
    2525include $(TOPDIR)/debian/package/robocfg/build.mk
    2626include $(TOPDIR)/debian/package/nvram/build.mk
    27 include $(TOPDIR)/debian/package/hostapd/build.mk
     27include $(TOPDIR)/debian/package/debwrt-hostapd/build.mk
    2828include $(TOPDIR)/debian/package/shellinabox/build.mk
    2929# include $(TOPDIR)/debian/package/libpar2/build.mk
    3030# include $(TOPDIR)/debian/package/nzbget/build.mk
    3131include $(TOPDIR)/debian/package/libnl-tiny/build.mk
    32 # include $(TOPDIR)/debian/package/swconfig/build.mk
     32include $(TOPDIR)/debian/package/swconfig/build.mk
    3333# include $(TOPDIR)/debian/package/led/build.mk
    3434include $(TOPDIR)/debian/package/broadcom-wl/build.mk
  • trunk/debian/package/debwrt-hostapd/build.mk

    r267 r563  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 DEBWRT_PKGLST:=$(DEBWRT_PKGLST) debian/package/hostapd
     18DEBWRT_PKGLST:=$(DEBWRT_PKGLST) debian/package/debwrt-hostapd
    1919
    20 debian/package/hostapd: debian/package/hostapd/deliver
     20debian/package/debwrt-hostapd: debian/package/debwrt-hostapd/deliver
    2121        touch $@
    2222
    23 debian/package/hostapd/deliver: debian/package/hostapd/build
     23debian/package/debwrt-hostapd/deliver: debian/package/debwrt-hostapd/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    25         cp -rav $(DEBIAN_BUILD_DIR)/usr/src/hostapd/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
    26         cp -rav $(DEBIAN_BUILD_DIR)/usr/src/hostapd/*.tar.gz ${INSTALL_DIR_DEBIAN_PACKAGES}
    27         cp -rav $(DEBIAN_BUILD_DIR)/usr/src/hostapd/*.dsc ${INSTALL_DIR_DEBIAN_PACKAGES}
    28         cp -rav $(DEBIAN_BUILD_DIR)/usr/src/hostapd/*.changes ${INSTALL_DIR_DEBIAN_PACKAGES}
     25        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     26        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd/*.tar.gz ${INSTALL_DIR_DEBIAN_PACKAGES}
     27        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd/*.dsc ${INSTALL_DIR_DEBIAN_PACKAGES}
     28        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd/*.changes ${INSTALL_DIR_DEBIAN_PACKAGES}
    2929        touch $@
    3030
    31 debian/package/hostapd/build: debian/package/hostapd/prepare debian/package/libnl
    32         $(CHROOT_USER) bash -c "cd /usr/src/hostapd; export ARCH=$(TARGET_ARCH); ./build.sh"
     31debian/package/debwrt-hostapd/build: debian/package/debwrt-hostapd/prepare debian/package/libnl
     32        $(CHROOT_USER) bash -c "cd /usr/src/debwrt-hostapd; export ARCH=$(TARGET_ARCH); ./build.sh"
    3333        touch $@
    3434
    35 debian/package/hostapd/prepare: debian/buildenv/create
    36         rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/hostapd
    37         mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/hostapd
    38         if [ -d $(DEBIAN_PACKAGES_DIR)/hostapd/debian ]; then \
    39             cp -ar $(DEBIAN_PACKAGES_DIR)/hostapd/debian $(DEBIAN_BUILD_DIR)/usr/src/hostapd; \
     35debian/package/debwrt-hostapd/prepare: debian/buildenv/create
     36        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd
     37        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd
     38        if [ -d $(DEBIAN_PACKAGES_DIR)/debwrt-hostapd/debian ]; then \
     39            cp -ar $(DEBIAN_PACKAGES_DIR)/debwrt-hostapd/debian $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd; \
    4040        fi
    41         cp -a $(DEBIAN_PACKAGES_DIR)/hostapd/patches   $(DEBIAN_BUILD_DIR)/usr/src/hostapd
    42         cp -ar $(DEBIAN_PACKAGES_DIR)/hostapd/build.sh $(DEBIAN_BUILD_DIR)/usr/src/hostapd
     41        cp -a $(DEBIAN_PACKAGES_DIR)/debwrt-hostapd/patches   $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd
     42        cp -ar $(DEBIAN_PACKAGES_DIR)/debwrt-hostapd/build.sh $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd
    4343        touch $@
    4444
    45 debian/package/hostapd/version:
    46         @rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/hostapdversion
    47         @mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/hostapdversion
     45debian/package/debwrt-hostapd/version:
     46        @rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapdversion
     47        @mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapdversion
    4848        @svn checkout --quiet --depth files \
    4949                svn://svn.openwrt.org/openwrt/trunk/package/hostapd \
    50                  $(DEBIAN_BUILD_DIR)/usr/src/hostapdversion
    51         @grep ^PKG_VERSION $(DEBIAN_BUILD_DIR)/usr/src/hostapdversion/Makefile
    52         @rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/hostapdversion
     50                 $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapdversion
     51        @grep ^PKG_VERSION $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapdversion/Makefile
     52        @rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapdversion
    5353
    54 debian/package/hostapd/clean:
    55         rm -f debian/package/hostapd/build
    56         rm -f debian/package/hostapd/prepare
    57         rm -f debian/package/hostapd/deliver
     54debian/package/debwrt-hostapd/clean:
     55        rm -f debian/package/debwrt-hostapd/build
     56        rm -f debian/package/debwrt-hostapd/prepare
     57        rm -f debian/package/debwrt-hostapd/deliver
    5858
  • trunk/debian/package/debwrt-hostapd/build.sh

    r517 r563  
    44# 2. Copy debian/directory to it
    55# 3. Run dpkg-buildpackage --arch=<ARCH> -rfakeroot
     6
     7set -e
    68
    79if [ -z $ARCH ]; then echo "First set \$ARCH before running the build script"; exit 1; fi
     
    1315[ "1" == $VERBOSE ] && set -x
    1416
    15 PACKAGE=hostapd
     17PACKAGE_SHORT=hostapd
     18PACKAGE=debwrt-${PACKAGE_SHORT}
    1619VERSION=1.0
    1720RELEASE=1
    18 DOWNLOAD_URL=svn://svn.openwrt.org/openwrt/trunk/package/network/services/${PACKAGE}
     21DOWNLOAD_URL=svn://svn.openwrt.org/openwrt/trunk/package/network/services/${PACKAGE_SHORT}
    1922DEP=
    2023
     
    2932svn checkout ${DOWNLOAD_URL} ${BUILD_DIR} | tail -n 3
    3033
    31 VERSION=`cat ${BUILD_DIR}/Makefile  | grep ^PKG_VERSION | awk -F ":=" '{print $2}'`
    32 OPENWRT_VERSION=${VERSION:=20100705}
    33 PACKAGE_SOURCE=hostapd-${OPENWRT_VERSION}.tar.bz2
    34 DOWNLOAD_URL2=http://mirror2.openwrt.org/sources/hostapd-${OPENWRT_VERSION}.tar.bz2
     34VERSION=`cat ${BUILD_DIR}/Makefile         | grep ^PKG_VERSION    | awk -F ":=" '{print $2}'`
     35PKG_REV=`cat ${BUILD_DIR}/Makefile         | grep ^PKG_REV         | awk -F ":=" '{print $2}'`
     36PKG_SOURCE_URL=`cat ${BUILD_DIR}/Makefile  | grep ^PKG_SOURCE_URL  | awk -F ":=" '{print $2}'`
     37OPENWRT_VERSION=${VERSION}
    3538
    36 if [ ! -s ${DOWNLOAD_DIR}/${PACKAGE_SOURCE} ]; then rm -f ${DOWNLOAD_DIR}/${PACKAGE_SOURCE}; wget -O ${DOWNLOAD_DIR}/${PACKAGE_SOURCE} $DOWNLOAD_URL2; fi
    37 mkdir -p ${BUILD_DIR}/src
    38 tar xjf ${DOWNLOAD_DIR}/${PACKAGE_SOURCE} -C ${BUILD_DIR}/src --strip 1
     39rm -rf ${BUILD_DIR}/src
     40git clone ${PKG_SOURCE_URL} ${BUILD_DIR}/src \
     41   && cd ${BUILD_DIR}/src \
     42   && git checkout ${PKG_REV} \
     43   && git submodule update
     44
     45cd ${BUILD_BASE_DIR}
    3946
    4047# apply openwrt patches
  • trunk/debian/package/debwrt-hostapd/debian/changelog

    r517 r563  
    1 hostapd (1.0-1) stable unstable; urgency=low
     1debwrt-hostapd (1.0-1) stable unstable; urgency=low
    22
    33  * Remove old checks from init script
  • trunk/debian/package/debwrt-hostapd/debian/control

    r85 r563  
    1 Source: hostapd
     1Source: debwrt-hostapd
    22Section: net
    33Priority: extra
     
    66Standards-Version: 3.8.4
    77
    8 Package: hostapd
     8Package: debwrt-hostapd
    99Architecture: any
    1010Depends: ${shlibs:Depends}, ${misc:Depends}
  • trunk/debian/package/debwrt-kernel-headers/build.mk

    r533 r563  
    2020DEBWRT_PKGLST:=$(DEBWRT_PKGLST) debian/package/debwrt-kernel-headers
    2121
    22 debian/package/debwrt-kernel-headers: debian/package/debwrt-kernel-headers/deliver
     22debian/package/debwrt-kernel-headers: openwrt/deliver/check debian/package/debwrt-kernel-headers/deliver
    2323        touch $@
    2424
     
    4343                cp $(INSTALL_DIR)/$(HEADERS_TAR_GZ) $(DEBIAN_BUILD_DIR)/usr/src/debwrt-kernel-headers; \
    4444        else \
    45                 @echo "E: please build OpenWrt first - we will be needing the kernel headers" ;\
    46                 @exit 1 ;\
     45                echo "E: please build OpenWrt first - we will be needing the kernel headers" ;\
     46                echo "E: Can't locate $(INSTALL_DIR)/$(HEADERS_TAR_GZ)" ;\
     47                exit 1 ;\
    4748        fi
    4849        touch $@
  • trunk/debian/package/debwrt-kernel-headers/debwrt-kernel-headers.sh

    r320 r563  
    44# 2. Copy debian/directory to it
    55# 3. Run dpkg-buildpackage --arch=<ARCH> -rfakeroot
     6
     7set -e
     8
     9if [ "${ARCH}" == "" ]
     10then
     11    echo "ARCH not set"
     12    exit 1
     13fi
    614
    715export DEBFULLNAME="Amain (DebWrt.net)"
     
    2129BUILD_BASE_DIR=${BASE_DIR}/${PACKAGE}
    2230BUILD_DIR=${BUILD_BASE_DIR}/${PACKAGE}-${VERSION}
    23 KCONF=${BUILD_BASE_DIR}/config-kernel-${VERSION}
    2431
    2532rm -rf ${BUILD_DIR}
    2633mkdir -p ${BUILD_DIR}
    2734cp -ra ${KERNEL_HEADERS_TAR_GZ} ${BUILD_DIR}
    28 cp -a ${KCONF} ${BUILD_DIR}/.config
    2935
    3036if [ ! -d debian ]; then
     
    3642   cd ${BUILD_DIR}
    3743   dch -v ${VERSION}-${RELEASE} -b -m -t "Automated packet generation"
    38    dpkg-buildpackage -a${ARCH:=mipsel} -rfakeroot -b
    39    find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH:=mipsel} -i {} || true
     44   dpkg-buildpackage -a${ARCH} -rfakeroot -b
     45   find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
    4046fi
    4147
  • trunk/debian/package/debwrt-net/debian/changelog

    r339 r563  
     1debwrt-net (0.4) stable; urgency=low
     2
     3  * Change dependancy from hostapd to debwrt-hostapd
     4
     5 -- Amain (DebWrt.net) <amain@debwrt.net>  Thu, 05 Dec 2013 22:28:00 +0000
     6
    17debwrt-net (0.3) stable; urgency=low
    28
  • trunk/debian/package/debwrt-net/debian/control

    r295 r563  
    88Package: debwrt-net
    99Architecture: all
    10 Depends: ${shlibs:Depends}, ${misc:Depends}, robocfg (>= 1.0.1), broadcom-wl, hostapd, swconfig, dnsmasq
     10Depends: ${shlibs:Depends}, ${misc:Depends}, robocfg (>= 1.0.1), broadcom-wl, debwrt-hostapd, swconfig, dnsmasq
     11Replaces: hostapd
    1112Description: DebWrt network scripts
  • trunk/debian/package/libnl/debian/control

    r46 r563  
    22Priority: extra
    33Maintainer: Amain (DebWrt.net) <amain@debwrt.net>
    4 Build-Depends: debhelper (>= 7), autotools-dev, debwrt-kernel-headers
     4Build-Depends: debhelper (>= 7), autotools-dev
    55Standards-Version: 3.7.3
    66Section: libs
  • trunk/debian/package/libnl/libnl.sh

    r163 r563  
    44# 2. Copy debian/directory to it
    55# 3. Run dpkg-buildpackage --arch=<ARCH> -rfakeroot
     6
     7set -e
    68
    79export DEBFULLNAME="Amain (DebWrt.net)"
     
    2325DOWNLOAD_DIR=${BASE_DIR}/dl
    2426
     27if ! ( dpkg --get-selections | grep debwrt-kernel-headers )
     28then
     29   echo "debwrt-kernel-headers package not installed"
     30   exit 1
     31fi
     32
    2533mkdir -p $DOWNLOAD_DIR
    2634rm -rf ${BUILD_DIR}
  • trunk/debian/package/robocfg/debian/robocfg.init

    r289 r563  
    22### BEGIN INIT INFO
    33# Provides:          robocfg
    4 # Required-Start:    ifupdown-clean
    5 # Required-Stop:     
     4# Required-Start:
     5# Required-Stop:
    66# Default-Start:     S
    7 # Default-Stop:     
     7# Default-Stop:
    88# Short-Description: Initialize vlan tagging on b44 ethernet switch with robocfg
    99# Description:       Initialize vlan tagging on b44 ethernet switch with robocfg
  • trunk/debian/package/shellinabox/build.sh

    r100 r563  
    44# 2. Copy debian/directory to it
    55# 3. Run dpkg-buildpackage --arch=<ARCH> -rfakeroot
     6
     7set -e
    68
    79if [ -z $ARCH ]; then echo "First set \$ARCH before running the build script"; exit 1; fi
     
    3739
    3840cd ${BUILD_DIR}
    39 dpkg-buildpackage -a${ARCH} -rfakeroot
     41# add -d: ignore build dependency check. Somehow dpkg-cross is not creating proper packages anymore,
     42#         or dpkg-buildpackage does not understand dpkg-cross package naming scheme anymore.
     43dpkg-buildpackage -d -a${ARCH} -rfakeroot
    4044find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
    4145
  • trunk/debian/package/swconfig/build.sh

    r517 r563  
    44# 2. Copy debian/directory to it
    55# 3. Run dpkg-buildpackage --arch=<ARCH> -rfakeroot
     6
     7set -e
    68
    79if [ -z $ARCH ]; then echo "First set \$ARCH before running the build script"; exit 1; fi
     
    2426DOWNLOAD_DIR=${BASE_DIR}/dl
    2527
     28if ! ( dpkg --get-selections | grep libnl-tiny-dev )
     29then
     30   echo "libnl-tiny-dev package not installed"
     31   exit 1
     32fi
     33
    2634mkdir -p $DOWNLOAD_DIR
    2735rm -rf ${BUILD_DIR}
     
    4149   cp -rav debian ${BUILD_DIR} | grep -v /.svn  # copy all, silence subversion
    4250   cd ${BUILD_DIR}
    43    dpkg-buildpackage -a${ARCH} -rfakeroot
     51   # build dependency checks broken for wheezy, checking it manually above
     52   dpkg-buildpackage -d -a${ARCH} -rfakeroot
    4453   find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
    4554fi
  • trunk/debian/rootfs/debian.mk

    r545 r563  
    4848               debian/rootfs/post-setup        \
    4949               debian/rootfs/second-stage-qemu \
     50               debian/rootfs/verify            \
    5051               debian/rootfs/save
    5152        @echo "I: root filesystem $(DEBIAN_BUILD_VERSION) $(TARGET_ARCH) prepared in $(ROOTFS_BUILD_DIR)"
     
    6970        fi
    7071        #touch $@
     72
     73debian/rootfs/verify:
     74        if [ -d $(ROOTFS_BUILD_DIR)/debootstrap ]; then \
     75                echo "E: Second stage install was not completed successfully" ;\
     76                echo "E: Please check debootstrap.log to inspect the situation:" ;\
     77                echo "E:    make chr" ;\
     78                echo "E:    vi /debootstrap/debootstrap.log" ;\
     79                exit 1 ;\
     80        fi
     81        touch $@
    7182
    7283debian/rootfs/save:
  • trunk/openwrt/openwrt-deliver.mk

    r517 r563  
    9696        cd $(OPENWRT_LINUX_DIR) && $(MAKE) headers_install ARCH=$(patsubst %el,%,$(TARGET_ARCH)) INSTALL_HDR_PATH=$(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)
    9797        # some overrides which are not cleanly installed by make headers_install
    98         cp $(OPENWRT_LINUX_DIR)/include/linux/switch.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)/include/linux/switch.h
     98        #cp $(OPENWRT_LINUX_DIR)/include/linux/switch.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)/include/linux/switch.h
    9999        cp $(OPENWRT_LINUX_DIR)/.config $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)
    100100        tar czf $(INSTALL_DIR)/$(HEADERS_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_HEADERS) .
Note: See TracChangeset for help on using the changeset viewer.