Changeset 581


Ignore:
Timestamp:
Dec 25, 2013, 10:18:41 AM (6 years ago)
Author:
amain
Message:

debwrt-net: fix build path

Location:
trunk/debian/package
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/debian/package/debian.mk

    r580 r581  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 run_in_chroot  = $(CHROOT_USER) bash -c "cd /usr/src/$(PKG_NAME); export ARCH=$(TARGET_ARCH); $(1)"
    19 run_in_chrootr = $(CHROOT)      bash -c "cd /usr/src/$(PKG_NAME); export ARCH=$(TARGET_ARCH); $(1)"
     18run_in_chroot        = $(CHROOT_USER) bash -c "cd /usr/src/$(PKG_NAME); export ARCH=$(TARGET_ARCH); $(1)"
     19run_in_chrootr       = $(CHROOT)      bash -c "cd /usr/src/$(PKG_NAME); export ARCH=$(TARGET_ARCH); $(1)"
     20
     21CH                  := "[\(\)]"
    2022
    2123DEBWRT_ROOTFS_PKGLST:= libnl iw debwrt-kernel-headers robocfg nvram \
  • trunk/debian/package/debwrt-net/build.mk

    r579 r581  
    1717
    1818include $(TOPDIR)/Makefile
     19 
     20PKG_NAME          = debwrt-net
    1921
    20 PKG_NAME      = debwrt-net
    21 
    22 CH            := "[\(\)]"
    23 PKG_VERSION    = $(shell head -1 $(DEBIAN_PACKAGES_DIR)/$(PKG_NAME)/debian/changelog | awk '{gsub(/'$(CH)'/,"",$$2); print $$1"-"$$2}')
    24 run_in_chroot  = $(CHROOT_USER) bash -c "cd /usr/src/$(PKG_NAME); export ARCH=$(TARGET_ARCH); $(1)"
     22CH               := "[\(\)]"
     23PKG_NAME_VERSION  = $(shell head -1 $(DEBIAN_PACKAGES_DIR)/$(PKG_NAME)/debian/changelog | awk '{gsub(/'$(CH)'/,"",$$2); print $$1"-"$$2}')
    2524
    2625debian/package/$(PKG_NAME)/all: debian/package/$(PKG_NAME)/deliver
     
    3635
    3736debian/package/$(PKG_NAME)/build: debian/package/$(PKG_NAME)/prepare
    38         $(call run_in_chroot,cd $(PKG_NAME);dpkg-buildpackage -a${ARCH} -rfakeroot)
     37        $(call run_in_chroot,cd /usr/src/$(PKG_NAME)/$(PKG_NAME_VERSION);dpkg-buildpackage -a${ARCH} -rfakeroot)
    3938        $(call run_in_chroot,find -maxdepth 1 -name "*.deb" | xargs -r -t -i sudo dpkg-cross -a ${TARGET_ARCH} -i {} || true)
    4039        touch $@
     
    4241debian/package/$(PKG_NAME)/prepare: debian/buildenv/create
    4342        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)
    44         mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)
    4543        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)/$(PKG_NAME_VERSION)
    4644        cp -ar $(DEBIAN_PACKAGES_DIR)/$(PKG_NAME)/* $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)/$(PKG_NAME_VERSION)
     
    4947
    5048debian/package/$(PKG_NAME)/clean:
    51         rm -f debian/package/$(PKG_NAME)/all
     49        rm -f debian/package/$(PKG_NAME)/all-
    5250        rm -f debian/package/$(PKG_NAME)/build
    5351        rm -f debian/package/$(PKG_NAME)/prepare
  • trunk/debian/package/robocfg

    • Property svn:ignore
      •  

        old new  
        22prepare
        33build
         4all
  • trunk/debian/package/swconfig

    • Property svn:ignore
      •  

        old new  
        22deliver
        33prepare
         4all
Note: See TracChangeset for help on using the changeset viewer.