Changeset 860


Ignore:
Timestamp:
Dec 4, 2016, 6:45:50 PM (3 years ago)
Author:
amain
Message:

libubox: initial patches

Location:
trunk/debian/packages/libubox/trunk
Files:
4 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/debian/packages/libubox/trunk/CMakeLists.txt

    r857 r860  
    4040)
    4141
    42 ADD_SUBDIRECTORY(lua)
    43 ADD_SUBDIRECTORY(examples)
     42#ADD_SUBDIRECTORY(lua)
     43#ADD_SUBDIRECTORY(examples)
    4444
    4545find_library(json NAMES json-c)
  • trunk/debian/packages/libubox/trunk/debian/control

    r856 r860  
    33Priority: optional
    44Maintainer: Johan van Zoomeren <amain@debwrt.net>
    5 Build-Depends: debhelper (>= 9), quilt
     5Build-Depends: debhelper (>= 9), quilt, cmake
    66Standards-Version: 3.9.8
    77Homepage: https://wiki.openwrt.org/doc/techref/libubox
    88
     9#Multi-Arch: same
    910Package: libubox1
    1011Architecture: any
    1112Depends: ${shlibs:Depends}, ${misc:Depends}
    1213Pre-Depends: ${misc:Pre-Depends}
    13 Multi-Arch: same
    1414Description: OpenWrt core library
    1515 It's one of the core libraries used within openwrt because it's a set of
  • trunk/debian/packages/libubox/trunk/debian/rules

    r854 r860  
    77DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
    88
    9 PACKAGE_VERSION := $(shell grep ^Source: debian/control | sed 's/^.*swconfig//')
    10 PACKAGE         := swconfig$(PACKAGE_VERSION)
    11 PACKAGE_LIB     := libsw$(PACKAGE_VERSION)
    12 PACKAGE_DEV     := libsw-dev
    13 
    14 # ../include contains switch.sh kernel API (see patch 007)
    15 CFLAGS+=-O2 -g -I ../include/uapi -I /usr/include/netlink-tiny
     9# extract version from changelog/control
     10OP            := (
     11CP            := )
     12VERSION_MAJOR := $(shell grep ^Source: debian/control | sed 's/^.*libubox//')
     13VERSION       := $(shell head -1 debian/changelog | tr -d '$(OP)' | tr -d '$(CP)' | awk '{print $$2}' | sed 's/~.*//')
     14VERSION_MINOR := $(shell echo $(VERSION) | awk -F '-' '{print $$1}' | tr -d '.')
     15VERSION_PATCH := $(shell echo $(VERSION) | awk -F '-' '{print $$2}')
    1616
    1717# not all variables are exported by default
    18 export PACKAGE
    19 export PACKAGE_LIB
    20 export PACKAGE_VERSION
     18export VERSION_MAJOR
     19export VERSION_MINOR
     20export VERSION_PATCH
    2121
    2222%:
    2323        dh $@
    2424
    25 override_dh_auto_build:
    26         $(MAKE) -C src
     25#override_dh_auto_build:
     26#       $(MAKE) -C src
    2727
    2828override_dh_auto_test:
    2929        :
    3030
    31 override_dh_auto_install:
    32         install -d debian/$(PACKAGE)/usr/sbin
    33         install -d debian/$(PACKAGE_LIB)/usr/lib/$(DEB_HOST_MULTIARCH)
    34         install -d debian/$(PACKAGE_DEV)/usr/lib/$(DEB_HOST_MULTIARCH)
    35         install -d debian/$(PACKAGE_DEV)/usr/include/sw
    36         install src/$(PACKAGE) debian/$(PACKAGE)/usr/sbin/$(PACKAGE)
    37         cp -v src/libsw.so.*.*.* debian/$(PACKAGE_LIB)/usr/lib/$(DEB_HOST_MULTIARCH)
    38         cp -dv src/libsw.so.* debian/$(PACKAGE_LIB)/usr/lib/$(DEB_HOST_MULTIARCH)
    39         cp -dv src/libsw.so debian/$(PACKAGE_DEV)/usr/lib/$(DEB_HOST_MULTIARCH)
    40         cp -v src/swlib.h debian/$(PACKAGE_DEV)/usr/include/sw
     31#override_dh_auto_install:
     32#       install -d debian/$(PACKAGE)/usr/sbin
     33#       install -d debian/$(PACKAGE_LIB)/usr/lib/$(DEB_HOST_MULTIARCH)
     34#       install -d debian/$(PACKAGE_DEV)/usr/lib/$(DEB_HOST_MULTIARCH)
     35#       install -d debian/$(PACKAGE_DEV)/usr/include/sw
     36#       install src/$(PACKAGE) debian/$(PACKAGE)/usr/sbin/$(PACKAGE)
     37#       cp -v src/libsw.so.*.*.* debian/$(PACKAGE_LIB)/usr/lib/$(DEB_HOST_MULTIARCH)
     38#       cp -dv src/libsw.so.* debian/$(PACKAGE_LIB)/usr/lib/$(DEB_HOST_MULTIARCH)
     39#       cp -dv src/libsw.so debian/$(PACKAGE_DEV)/usr/lib/$(DEB_HOST_MULTIARCH)
     40#       cp -v src/swlib.h debian/$(PACKAGE_DEV)/usr/include/sw
    4141
    42 override_dh_auto_clean:
    43         rm -f src/swconfig src/*.o src/libsw.*
     42#override_dh_auto_clean:
     43#       rm -f src/swconfig src/*.o src/libsw.*
    4444
Note: See TracChangeset for help on using the changeset viewer.