Changeset 838


Ignore:
Timestamp:
Dec 3, 2016, 8:55:20 PM (3 years ago)
Author:
amain
Message:

swconfig11: latest fixes / rename from swconfig

Location:
trunk/debian/packages
Files:
4 added
3 deleted
6 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/debian/packages/nvram9/trunk/debian/changelog

    r835 r838  
    1 nvram (0.0.9-1~debwrt70+1) wheezy-debwrt-unstable; urgency=medium
     1nvram9 (0.0-1~debwrtSID+1) sid-debwrt-unstable; urgency=medium
    22
    3   * Set version according to mini-buildd version scheme
     3  * Import from nvram 0.0.9
     4  * Move to svn-buildpackage
     5  * Rename to nvram<api-verion> to support multiple kernel API versions
    46
    5  -- Johan van Zoomeren <amain@debwrt.net>  Fri, 20 Nov 2015 18:59:23 +0100
    6 
    7 nvram (0.0.9-1) wheezy-debwrt-unstable; urgency=medium
    8 
    9   * Actual OpenWrt package version is 0.0(not specified), release 9 > 0.0.9
    10 
    11  -- Johan van Zoomeren <amain@debwrt.net>  Sun, 15 Nov 2015 19:48:27 +0100
    12 
    13 nvram (0.9-1) stretch-debwrt-unstable; urgency=medium
    14 
    15   * Move to DebWrt repository
    16 
    17  -- Johan van Zoomeren <amain@debwrt.net>  Sat, 14 Nov 2015 22:03:18 +0100
    18 
    19 nvram (1.0) unstable; urgency=low
    20 
    21   * Initial Release.
    22 
    23  -- Amain (DebWrt.net) <amain@debwrt.net>  Thu, 02 Sep 2010 10:12:18 +0000
    24 
     7 -- Johan van Zoomeren <amain@debwrt.net>  Sat, 03 Dec 2016 20:40:40 +0100
  • trunk/debian/packages/nvram9/trunk/debian/control

    r835 r838  
    1 Source: nvram
     1Source: nvram9
    22Section: admin
    33Priority: optional
    44Maintainer: Johan van Zoomeren <amain@debwrt.net>
    55Build-Depends: debhelper (>= 9)
    6 Standards-Version: 3.9.6
     6Standards-Version: 3.9.8
    77Homepage: http://wiki.openwrt.org/OpenWrtNVRAM
    88
    9 Package: nvram
     9Package: nvram9
    1010Architecture: any
    1111Depends: ${shlibs:Depends}, ${misc:Depends}
     12Replaces: nvram
    1213Description: Read/Write values from nvram of embedded devices
    1314 NVRAM stands for Non-Volatile RAM, in this case the last 64K of the flash chip
    14  used to store various configuration information in a name=value format.
    15 
     15 used to store various configuration information in a name=value format. Multiple
     16 versions of nvram may be installed, each supporting a different nvram kernel
     17 API level.
  • trunk/debian/packages/swconfig11/trunk/debian/changelog

    r822 r838  
    1 swconfig (0.0.11-1~debwrtSID+1) sid-debwrt-unstable; urgency=medium
     1swconfig11 (0.0-1~debwrtSID+1) sid-debwrt-unstable; urgency=medium
    22
    3   * Upstream update 11
    4   * Use svn-buildpackage
     3  * Import from swconfig 0.0.10
     4  * Split swconfig to allow installing multiple versions of the tool supporting
     5    different switch API levels.
    56
    6  -- Johan van Zoomeren <amain@debwrt.net>  Tue, 29 Nov 2016 22:52:08 +0100
    7 
    8 swconfig (0.0.10-2~debwrt70+1) wheezy-debwrt-unstable; urgency=medium
    9 
    10   * Update version to mini-buildd versioning scheme
    11 
    12  -- Johan van Zoomeren <amain@debwrt.net>  Fri, 20 Nov 2015 20:57:33 +0100
    13 
    14 swconfig (0.0.10-1) stretch-debwrt-unstable; urgency=medium
    15 
    16   * Actual OpenWrt package version is 0.0(not specified), release 10 > 0.0.10
    17 
    18  -- Johan van Zoomeren <amain@debwrt.net>  Sun, 15 Nov 2015 17:25:49 +0100
    19 
    20 swconfig (47459-1) stretch-debwrt-unstable; urgency=medium
    21 
    22   * Update to debian compat level 9
    23 
    24  -- Johan van Zoomeren <amain@debwrt.net>  Wed, 11 Nov 2015 20:04:25 +0100
    25 
    26 swconfig (0.1) unstable; urgency=low
    27 
    28   * Initial Release.
    29 
    30  -- Johan van Zoomeren <amain@debwrt.net>  Sat, 06 Nov 2010 18:50:39 +0000
     7 -- Johan van Zoomeren <amain@debwrt.net>  Sat, 03 Dec 2016 19:46:08 +0100
  • trunk/debian/packages/swconfig11/trunk/debian/control

    r811 r838  
    1 Source: swconfig
     1Source: swconfig11
    22Section: net
    33Priority: optional
     
    77Homepage: https://wiki.openwrt.org/doc/techref/swconfig
    88
    9 Package: libsw0
     9Package: libsw11
    1010Architecture: any
    11 Depends: ${shlibs:Depends}, ${misc:Depends}
     11Depends: ${shlibs:Depends}, ${misc:Depends}, libnl-tiny0
    1212Pre-Depends: ${misc:Pre-Depends}
     13Replaces: libsw0
    1314Multi-Arch: same
    1415Description: Configure managed switches shared library
     
    1617 helps users configure ports on a managed switch to configure things like VLAN
    1718 tagging. Note that swconfig is an OpenWrt kernel feature only and is not a part
    18  of mainline Linux.
     19 of mainline Linux. Multiple version of the package may be installed to support
     20 multiple kernel switch API versions.
    1921
    2022Package: libsw-dev
    2123Section: libdevel
    2224Architecture: any
    23 Depends: libsw0 (= ${binary:Version}), ${misc:Depends}
     25Depends: libsw11 (= ${binary:Version}), ${misc:Depends}
    2426Description: Configure managed switches shared library development files
    2527 swconfig is a lightweight Linux kernel driver API and a command-line tool that
     
    2830 of mainline Linux.
    2931
    30 Package: swconfig
     32Package: swconfig11
    3133Architecture: any
    32 Depends: ${shlibs:Depends}, ${misc:Depends}, libnl-tiny0, libsw0
     34Depends: ${shlibs:Depends}, ${misc:Depends}, libnl-tiny0, libsw11
     35Replaces: swconfig
    3336Description: Configure managed switches
    3437 swconfig is a lightweight Linux kernel driver API and a command-line tool that
    3538 helps users configure ports on a managed switch to configure things like VLAN
    3639 tagging. Note that swconfig is an OpenWrt kernel feature only and is not a part
    37  of mainline Linux.
     40 of mainline Linux. Multiple version of the package may be installed to support
     41 multiple kernel switch API versions.
    3842
  • trunk/debian/packages/swconfig11/trunk/debian/patches/011_use_openwrt_version_for_so

    r819 r838  
    11Author: Johan van Zoomeren <amain@debwrt.net>
    22
    3 Index: swconfig-0.0.10/src/Makefile
     3Index: swconfig10-0.0/src/Makefile
    44===================================================================
    5 --- swconfig-0.0.10.orig/src/Makefile
    6 +++ swconfig-0.0.10/src/Makefile
    7 @@ -6,7 +6,7 @@ LIBS=-lnl-tiny
     5--- swconfig10-0.0.orig/src/Makefile
     6+++ swconfig10-0.0/src/Makefile
     7@@ -6,10 +6,10 @@ LIBS=-lnl-tiny
    88 LIBNAME=libsw
    99 STATICLIB=$(LIBNAME).a
    1010 SHAREDLIB=$(LIBNAME).so
    1111-SHAREDLIBV=$(LIBNAME).so.0.0.0
    12 +SHAREDLIBV=$(LIBNAME).so.0.0.10
    13  SHAREDLIBM=$(LIBNAME).so.0
     12-SHAREDLIBM=$(LIBNAME).so.0
     13+SHAREDLIBV=$(LIBNAME).so.$(PACKAGE_VERSION).0.0
     14+SHAREDLIBM=$(LIBNAME).so.$(PACKAGE_VERSION)
    1415 
    15  all: swconfig
     16-all: swconfig
     17+all: swconfig$(PACKAGE_VERSION)
     18 
     19 %.o: %.c
     20        $(CC) $(CFLAGS) -fPIC -c -o $@ $^
     21@@ -20,5 +20,5 @@ $(SHAREDLIBV): swlib.o
     22        ln -s $@ $(SHAREDLIB)
     23        ln -s $@ $(SHAREDLIBM)
     24 
     25-swconfig: $(SHAREDLIBV) cli.o
     26+swconfig$(PACKAGE_VERSION): $(SHAREDLIBV) cli.o
     27        $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -L./ -lsw
  • trunk/debian/packages/swconfig11/trunk/debian/rules

    r821 r838  
    77DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
    88
    9 PACKAGE := swconfig
    10 PACKAGE_LIB := libsw0
    11 PACKAGE_DEV := libsw-dev
     9PACKAGE_VERSION := $(shell grep ^Source: debian/control | sed 's/^.*swconfig//')
     10PACKAGE         := swconfig$(PACKAGE_VERSION)
     11PACKAGE_LIB     := libsw$(PACKAGE_VERSION)
     12PACKAGE_DEV     := libsw-dev
    1213
    1314# ../include contains switch.sh kernel API (see patch 007)
    1415CFLAGS+=-O2 -g -I ../include/uapi -I /usr/include/netlink-tiny
     16
     17# not all variables are exported by default
     18export PACKAGE
     19export PACKAGE_LIB
     20export PACKAGE_VERSION
    1521
    1622%:
     
    2834        install -d debian/$(PACKAGE_DEV)/usr/lib/$(DEB_HOST_MULTIARCH)
    2935        install -d debian/$(PACKAGE_DEV)/usr/include/sw
    30         install src/swconfig debian/$(PACKAGE)/usr/sbin/swconfig
     36        install src/$(PACKAGE) debian/$(PACKAGE)/usr/sbin/$(PACKAGE)
    3137        cp -v src/libsw.so.*.*.* debian/$(PACKAGE_LIB)/usr/lib/$(DEB_HOST_MULTIARCH)
    3238        cp -dv src/libsw.so.* debian/$(PACKAGE_LIB)/usr/lib/$(DEB_HOST_MULTIARCH)
    3339        cp -dv src/libsw.so debian/$(PACKAGE_DEV)/usr/lib/$(DEB_HOST_MULTIARCH)
    34         cp -v src/swlib.h debian/$(PACKAGE_DEV)/usr/include
     40        cp -v src/swlib.h debian/$(PACKAGE_DEV)/usr/include/sw
    3541
    3642override_dh_auto_clean:
Note: See TracChangeset for help on using the changeset viewer.