diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
| commit | b108fdcb83d457e5d43298fb93dbfd805d076f24 (patch) | |
| tree | 7fbd64a13fc915f5cea93708419cb3c6aa1b40ea /package/python-pyasn/python-pyasn.mk | |
| parent | a6cfaea44e5105cb66e4e797042f64335f5e7c01 (diff) | |
| parent | 9e40a1005f51d10784db295797ed270a130d79d5 (diff) | |
| download | buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.tar.gz buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.zip | |
Merge branch 'next'
Conflicts:
Makefile
package/dmraid/Config.in
package/gdb/Config.in.host
package/linux-headers/linux-headers.mk
package/python/python.mk
package/python3/python3.mk
package/rt-tests/Config.in
package/sdl/sdl.mk
package/systemd/systemd-01-fix-getty-unit.patch
package/systemd/systemd-02-fix-page-size.patch
package/systemd/systemd-03-uclibc-fix.patch
package/udev/Config.in
package/udisks/Config.in
package/vlc/vlc.mk
system/Config.in
Quite some merge conflicts, hopefully I didn't screw up anything.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/python-pyasn/python-pyasn.mk')
| -rw-r--r-- | package/python-pyasn/python-pyasn.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/package/python-pyasn/python-pyasn.mk b/package/python-pyasn/python-pyasn.mk index b0072225b6..43fabe9cff 100644 --- a/package/python-pyasn/python-pyasn.mk +++ b/package/python-pyasn/python-pyasn.mk @@ -4,16 +4,10 @@ # ################################################################################ -PYTHON_PYASN_VERSION = 1.2 -PYTHON_PYASN_SOURCE = PyASN-$(PYTHON_PYASN_VERSION).zip -PYTHON_PYASN_SITE = https://pyasn.googlecode.com/files +PYTHON_PYASN_VERSION = 0.17 +PYTHON_PYASN_SOURCE = pyasn1-$(PYTHON_PYASN_VERSION).tar.gz +PYTHON_PYASN_SITE = https://pypi.python.org/packages/source/p/pyasn1/ PYTHON_PYASN_LICENSE = LGPLv3+ (pyasn.cpp), GPLv2+ (libgds) PYTHON_PYASN_SETUP_TYPE = distutils -define PYTHON_PYASN_EXTRACT_CMDS - unzip -d $(@D) $(DL_DIR)/$(PYTHON_PYASN_SOURCE) - mv $(@D)/PyASN-$(PYTHON_PYASN_VERSION)/* $(@D) - $(RM) -r $(@D)/PyASN-$(PYTHON_PYASN_VERSION) -endef - $(eval $(python-package)) |
