From 24649caaee15d9d43a3c6dcfe1712b4eb113e89e Mon Sep 17 00:00:00 2001 From: "Carl D. Roth" Date: Wed, 13 Apr 2016 13:49:56 -0700 Subject: [PATCH] Back out pyblkid --- .../any/initrds/buildroot/builds/Makefile | 10 +--------- .../buildroot/builds/buildroot.config-powerpc | 1 - .../buildroot/builds/buildroot.config-x86_64 | 1 - .../builds/patches/pyblkid-0.0.1.tar.bz2 | Bin 4429 -> 4492 bytes 4 files changed, 1 insertion(+), 11 deletions(-) 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 ff435b4fd33ddceaace9521c8cc8d97cc7901de6..5d2818586af86e20818a2347b95b1ec7017eba8e 100644 GIT binary patch literal 4492 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 eGRrNHzv|d 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 TdLbqO5By!p6yZWa?yq7L-CYg>