Changeset 722 for branches


Ignore:
Timestamp:
Jan 26, 2016, 4:47:18 AM (4 years ago)
Author:
ehem
Message:

Fix debian/rules to get resultant packages matching better with kernels.
Notably ensure it depends upon the correct kernel package name even if
make-kpkg's --stem option was used.
Tiny update to patch #995 to match current OpenWRT source. This was
originally to get BCM4716 devices working and I suspect upstream natively
functions with such now, but leaving this in place for the moment.

Location:
branches/contrib/debian/package-build/broadcom-sta-mips-source
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/contrib/debian/package-build/broadcom-sta-mips-source/debian/_KPKG_STEM_-module-broadcom-sta-_-KVERS-_.postinst.modules.in

    r719 r722  
    55
    66# the kernel version we're built for (and /lib/modules/${kver})
    7 kver=`grep -e^/lib/modules/.\\\\+/.\\\\+\\\\.ko\\\$ ${list} | head -1 | cut -d/ -f4`
     7#kver=`grep -e^/lib/modules/.\\\\+/.\\\\+\\\\.ko\\\$ ${list} | head -1 | cut -d/ -f4`
     8kver=_KVERS_
    89
    910# run depmod, we need to give the version since it may not be the loaded kernel
  • branches/contrib/debian/package-build/broadcom-sta-mips-source/debian/changelog

    r664 r722  
     1broadcom-sta-mips-source (0.1.2) unstable; urgency=low
     2
     3  * Adjust debian/control to ensure resultant module package depends on
     4    correct kernel package name, even if make-kpkg's --stem option was used.
     5  * Update patch 995 to mesh with more recent upstream OpenWRT code.
     6
     7 -- Elliott Mitchell <ehem+debwrt@m5p.com>  Sun, 24 Jan 2016 23:13:58 -0800
     8
    19broadcom-sta-mips-source (0.1.1) unstable; urgency=low
    210
  • branches/contrib/debian/package-build/broadcom-sta-mips-source/debian/control.modules.in-pre-local

    r719 r722  
    1414 this should then make it easy to build the Broadcom STA 802.11 support module.
    1515
    16 Package: linux-module-broadcom-sta-_KVERS_
     16Package: _KPKG_STEM_-module-broadcom-sta-_KVERS_
    1717Architecture: mips mipsel
    1818Provides: linux-module-broadcom-sta
    19 Depends: linux-image-_KVERS_, broadcom-wl
     19Depends: _KPKG_STEM_-image-_KVERS_, broadcom-wl
    2020Description: broadcom-sta modules for Linux (kernel _KVERS_).  This package
    2121 contains the set of loadable kernel modules for the using a Broadcom STA 802.11
  • branches/contrib/debian/package-build/broadcom-sta-mips-source/debian/rules

    r664 r722  
    1313# needed for the kernel modules.
    1414
    15 #PKG = linux-module-broadcom-sta
     15#PKG = $(KPKG_STEM)-module-broadcom-sta
    1616
    1717# Uncomment this to turn on verbose mode.
     
    3434
    3535# prefix of the target package name
    36 PACKAGE=linux-module-broadcom-sta
     36PACKAGE=$(KPKG_STEM)-module-broadcom-sta
    3737# modifieable for experiments or debugging m-a
    3838MA_DIR ?= /usr/share/modass
     
    132132        cp -fpR glue $*/glue
    133133
    134         ls -1 patches/[0-9][0-9][0-9]*.patch | sort | \
     134        ls -1 patches/[0-9][0-9][0-9]-*.patch | sort | \
    135135        while read patch ; \
    136136        do patch -d $* -p1 < "$${patch}" ; \
     
    262262
    263263
    264 .PHONY: build clean binary-indep binary install configure binary-modules kdist kdist_configure kdist_image kdist_clean
    265 
     264# I'd prefer to use 's/_-\([A-Z]\+\)-_/_\1_/g' instead of
     265# 's/_-KVERS-_/$(KVERS)/g', unfortunately the expansion of $(wildcard ...) in
     266# prep-dev-files is done when the rule is read, not when the rule is invoked
     267# (before this rule is invoked and so the files don't yet exist)
     268prep-deb-files: prep-deb-files-pre-local
     269prep-deb-files-pre-local:
     270        for templ in $(wildcard $(CURDIR)/debian/*_KPKG_STEM_*); do \
     271    cp $$templ `echo $$templ | sed -e 's/_KPKG_STEM_/$(KPKG_STEM)/g ; s/_-KVERS-_/$(KVERS)/g'` ; \
     272  done
     273        for templ in `ls debian/*-pre-local` ; do \
     274    test -e $${templ%-pre-local}.backup || cp $${templ%-pre-local} $${templ%-pre-local}.backup 2>/dev/null || true; \
     275    sed -e 's/_KPKG_STEM_/$(KPKG_STEM)/g' < $$templ > $${templ%-pre-local}; \
     276  done
     277
     278
     279.PHONY: build clean binary-indep binary install configure binary-modules kdist kdist_configure kdist_image kdist_clean prep-deb-files-pre-local
     280
  • branches/contrib/debian/package-build/broadcom-sta-mips-source/patches-debwrt/995-brcm4716-workaround.patch

    r658 r722  
    1212+       SSB_DEVICE(SSB_VENDOR_BROADCOM2, SSB_DEV_80211, SSB_ANY_REV),
    1313+#endif
    14         SSB_DEVTABLE_END
     14        {},
    1515 };
    1616 
Note: See TracChangeset for help on using the changeset viewer.