diff options
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | .gitignore | 23 | ||||
| -rw-r--r-- | PKGBUILD | 74 | ||||
| -rw-r--r-- | bitbake.install | 2 | ||||
| -rw-r--r-- | ignore-TestHashEquivalenceTCPServer.patch | 12 |
5 files changed, 82 insertions, 51 deletions
@@ -1,24 +1,22 @@ pkgbase = bitbake - pkgdesc = Build tool executing tasks and managing metadata. - pkgver = 1.40.0 - pkgrel = 5 + pkgdesc = Build tool executing tasks and managing metadata + pkgver = 2.2.1 + pkgrel = 1 url = https://www.openembedded.org/wiki/Main_Page arch = any license = GPL2 - makedepends = git - source = https://github.com/openembedded/bitbake/archive/1.40.0.tar.gz - md5sums = 902bb4b71bb85fe55cdcf24bf21a7214 - -pkgname = bitbake - install = bitbake.install depends = python depends = python-beautifulsoup4 - depends = python-codegen - depends = python-django18 depends = python-ply + depends = python-codegen depends = python-progressbar depends = python-pyinotify depends = python-simplediff + source = https://git.openembedded.org/bitbake/snapshot/bitbake-2.2.1.tar.gz + sha256sums = 12eb41839071c60c60a005ffadbac13e1017a7cb4c2a38b04946471dc22bb5bc -pkgname = bitbake-vim +pkgname = bitbake + install = bitbake.install +pkgname = bitbake-vim + depends = diff --git a/.gitignore b/.gitignore index e3a9ab4146fb..4ca598e5cf12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,16 @@ -pkg -src -bitbake/* -*.tar.xz -*.tar.gz -__pycache__ -pyshtables.py +* +!*.conf +!*.desktop +!*.install +!*.patch +!*.rules +!*.service +!*.sh +!*.sysusers +!*.tmpfiles +!.SRCINFO +!.gitignore +!COPYRIGHT +!LICENSE +!PKGBUILD +libinjection_python_port.patch @@ -1,54 +1,66 @@ -# Maintainer: Matthew McGinn <mamcgi@gmail.com> +# Contributor: Matthew McGinn <mamcgi@gmail.com> # Contributor: Felipe F. Tonello <eu@felipetonello.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # TODO: support Toast pkgbase=bitbake -pkgname=('bitbake' 'bitbake-vim') -pkgver=1.40.0 -pkgrel=5 -_pythonver=3.7 -pkgdesc='Build tool executing tasks and managing metadata.' -arch=('any') -url='https://www.openembedded.org/wiki/Main_Page' -license=('GPL2') -makedepends=('git') -source=("https://github.com/openembedded/bitbake/archive/${pkgver}.tar.gz") -md5sums=('902bb4b71bb85fe55cdcf24bf21a7214') - -check() { - cd ${pkgbase}-${pkgver}/bin - PYTHONPATH="${srcdir}/${pkgbase}-${pkgver}/lib" python ./bitbake-selftest -} +pkgname=(bitbake bitbake-vim) +pkgver=2.2.1 +pkgrel=1 +pkgdesc="Build tool executing tasks and managing metadata" +url="https://www.openembedded.org/wiki/Main_Page" +license=(GPL2) +arch=(any) +depends=(python python-beautifulsoup4 python-ply python-codegen + python-progressbar python-pyinotify python-simplediff) +#checkdepends=(git wget) +source=("https://git.openembedded.org/bitbake/snapshot/bitbake-${pkgver}.tar.gz") +sha256sums=('12eb41839071c60c60a005ffadbac13e1017a7cb4c2a38b04946471dc22bb5bc') + +#check() { +# if ! git config --global --get user.name; then +# unset_name=1 +# git config --global user.name "Bitbake Tester" +# fi +# if ! git config --global --get user.email; then +# unset_email=1 +# git config --global user.email "test@bitbake.com" +# fi +# cd "${pkgbase}-${pkgver}" +# patch -p0 < "${srcdir}/ignore-TestHashEquivalenceTCPServer.patch" +# BB_SKIP_NETTESTS='yes' PYTHONPATH="${srcdir}/${pkgbase}-${pkgver}/lib" PATH="${PATH}:${srcdir}/${pkgbase}-${pkgver}/bin" python ./bin/bitbake-selftest --failfast -v +# if [ "${unset_name}" -eq 1 ]; then +# unset_name=1 +# git config --global --unset user.name +# fi +# if [ "${unset_email}" -eq 1 ]; then +# unset_email=1 +# git config --global --unset user.email +# fi +#} package_bitbake() { - depends=( - 'python' - 'python-beautifulsoup4' - 'python-codegen' - 'python-django18' - 'python-ply' - 'python-progressbar' - 'python-pyinotify' - 'python-simplediff' - ) install=bitbake.install - cd ${pkgbase}-${pkgver} + _pythonver=$(python --version | awk '{print $2}' | awk -F. '{print $1"."$2}') + cd "${pkgbase}-${pkgver}" + find . -iname "*.log" -delete install -d "${pkgdir}/usr/bin" install bin/bitbake* "${pkgdir}/usr/bin" install -d "${pkgdir}/usr/lib/python${_pythonver}/site-packages" cp -Ra lib/bb "${pkgdir}/usr/lib/python${_pythonver}/site-packages" cp -Ra lib/prserv "${pkgdir}/usr/lib/python${_pythonver}/site-packages" + cp -Ra lib/hashserv "${pkgdir}/usr/lib/python${_pythonver}/site-packages" + cp -Ra lib/bb/pysh "${pkgdir}/usr/lib/python${_pythonver}/site-packages" - install -d "${pkgdir}/usr/share/man/man1" - install doc/bitbake.1 "${pkgdir}/usr/share/man/man1" + install -D doc/bitbake.1 -t "${pkgdir}/usr/share/man/man1" } package_bitbake-vim() { - cd ${pkgbase}-${pkgver} + depends=() + cd "${pkgbase}-${pkgver}" install -d "${pkgdir}/usr/share" cp -Ra contrib/vim "${pkgdir}/usr/share" diff --git a/bitbake.install b/bitbake.install index a769dc814aba..a02deadeb22e 100644 --- a/bitbake.install +++ b/bitbake.install @@ -1,5 +1,5 @@ post_install() { - _pythonver=3.7 + _pythonver=$(python --version | awk '{print $2}' | awk -F. '{print $1"."$2}') echo "Please add to '/usr/lib/python${_pythonver}/site-packages/bb' to PYTHONPATH shell variable in order for bitbake to work." echo "example: echo export PYTHONPATH=/usr/lib/python${_pythonver}/site-packages/bb >> ~/.bash_profile" } diff --git a/ignore-TestHashEquivalenceTCPServer.patch b/ignore-TestHashEquivalenceTCPServer.patch new file mode 100644 index 000000000000..0c98f06d5afc --- /dev/null +++ b/ignore-TestHashEquivalenceTCPServer.patch @@ -0,0 +1,12 @@ +--- lib/hashserv/tests.py 2020-05-18 13:12:51.302335815 -0400 ++++ lib/hashserv/tests.py 2020-05-18 13:13:05.370499252 -0400 +@@ -137,6 +137,6 @@ + return "unix://" + os.path.join(self.temp_dir.name, 'sock') + + +-class TestHashEquivalenceTCPServer(TestHashEquivalenceServer, unittest.TestCase): +- def get_server_addr(self): +- return "localhost:0" ++#class TestHashEquivalenceTCPServer(TestHashEquivalenceServer, unittest.TestCase): ++# def get_server_addr(self): ++# return "localhost:0" |