diff --git a/packages/base/any/initrds/buildroot/builds/Makefile b/packages/base/any/initrds/buildroot/builds/Makefile index 070a932e..cb5c208a 100644 --- a/packages/base/any/initrds/buildroot/builds/Makefile +++ b/packages/base/any/initrds/buildroot/builds/Makefile @@ -28,7 +28,7 @@ clean: rm -rf $(BUILDROOT_ARCHDIRS) -setup: setup-pyroute2 setup-dnspython setup-libyaml setup-pyyaml setup-jq setup-pyparted setup-pyblkid +setup: setup-pyroute2 setup-dnspython setup-libyaml setup-pyyaml setup-jq setup-pyparted cp $(wildcard patches/busybox*.patch) $(BUILDROOT_SOURCE)/package/busybox/ cp $(wildcard patches/kexec*.patch) $(BUILDROOT_SOURCE)/package/kexec/ sed -i 's%^DOSFSTOOLS_SITE =.*%DOSFSTOOLS_SITE = http://downloads.openwrt.org/sources%' $(BUILDROOT_SOURCE)/package/dosfstools/dosfstools.mk @@ -76,14 +76,6 @@ setup-pyparted: sed -i '/[/]python-pyparted[/]/d' $(BUILDROOT_SOURCE)/package/Config.in sed -i '/[/]python-setuptools[/]/a\source "package/python-pyparted/Config.in"' $(BUILDROOT_SOURCE)/package/Config.in -setup-pyblkid: - mkdir -p $(BUILDROOT_SOURCE)/package/python-pyblkid - cp patches/python-pyblkid.mk $(BUILDROOT_SOURCE)/package/python-pyblkid/python-pyblkid.mk - cp patches/python-pyblkid.Config.in $(BUILDROOT_SOURCE)/package/python-pyblkid/Config.in - cp patches/pyblkid*.tar.bz2 $(BUILDROOT_SOURCE)/dl/. - sed -i '/[/]python-pyblkid[/]/d' $(BUILDROOT_SOURCE)/package/Config.in - sed -i '/[/]python-setuptools[/]/a\source "package/python-pyblkid/Config.in"' $(BUILDROOT_SOURCE)/package/Config.in - define buildroot_arch buildroot-$(1): diff --git a/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc b/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc index 37fdac2b..84d06b85 100644 --- a/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc +++ b/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc @@ -636,7 +636,6 @@ BR2_PACKAGE_PYTHON_DNSPYTHON=y BR2_PACKAGE_PYTHON_PYROUTE2=y BR2_PACKAGE_PYTHON_YAML=y BR2_PACKAGE_PYTHON_PYPARTED=y -BR2_PACKAGE_PYTHON_PYBLKID=y # BR2_PACKAGE_RUBY is not set # BR2_PACKAGE_TCL is not set diff --git a/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 b/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 index 5bc77713..0ae7448b 100644 --- a/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 +++ b/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 @@ -611,7 +611,6 @@ BR2_PACKAGE_PYTHON_DNSPYTHON=y BR2_PACKAGE_PYTHON_PYROUTE2=y BR2_PACKAGE_PYTHON_YAML=y BR2_PACKAGE_PYTHON_PYPARTED=y -BR2_PACKAGE_PYTHON_PYBLKID=y # BR2_PACKAGE_RUBY is not set # BR2_PACKAGE_TCL is not set diff --git a/packages/base/any/initrds/buildroot/builds/patches/pyblkid-0.0.1.tar.bz2 b/packages/base/any/initrds/buildroot/builds/patches/pyblkid-0.0.1.tar.bz2 index ff435b4f..5d281858 100644 Binary files a/packages/base/any/initrds/buildroot/builds/patches/pyblkid-0.0.1.tar.bz2 and b/packages/base/any/initrds/buildroot/builds/patches/pyblkid-0.0.1.tar.bz2 differ