[eos-pkgbuild-setup] fixed a small build bug

endeavouros-team · Aug 4, 2023 · 2ec37ab · 2ec37ab
1 parent ba6ceb2
commit 2ec37ab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/eos-pkgbuild-setup/PKGBUILD b/eos-pkgbuild-setup/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=eos-pkgbuild-setup
 pkgdesc="Environment setup and tools for building EOS packages."
 pkgver=2023    # new numbering! Previous was: 2022.12.25
-pkgrel=32.9
+pkgrel=32.10
 arch=(any)
 license=(GPL2)
 url="https://github.com/endeavouros-team/PKGBUILDS/raw/master/eos-pkgbuild-setup"
@@ -59,7 +59,7 @@ source=(
 sha512sums=('ef90d33ec65cf02aabc2c6aec9ac6ef9772aae7d33e7b960930904dcdf3dcde86bda132377b8ac435addba30fc6c34cb8d2f49074c96732800b3c4b7c5db85bf'
             '15b4a800e60d65a5b4e888a6baa5cb6336b78255ff39f8c54563c77bdbff2299b84e65d456452097c5cbd36df1fae2cdcab41f65b9d86a2c0b6b973f5cc577a9'
             'be63de6c49f05f909a0b15e406eb43cad59cd15992ad1fa1ebda58245761fccd309f3aae76e6f3f86e6cd1e0d6279ed43a08aa7f7a2c312a493a55fe819dbc87'
-            '927c4148f6f1dc5158191fa4459d07c991e6010138af422dc084fd154dee03d6ca5f2f637a092cdd1c238b658b6d1f3a1fd2862c2d72624ca003596e4ebfa577'
+            '5498356c462cbeef787cba6aa395eaa939852441be60d8a2dd4cc3cc00dcb2256bae8423f9032121a382f6b55080afaf8c9d35c7677570129c846cb4edbe41ab'
             '6185ce690604d382eda4e9edf5d3a113f71d89c54e0fe23384bb53e421e127c98263dea799126776203c48ac8ba9c2732beb98360047da87226845436ab10c91'
             '57fe6b53b43148cc3aa87b65abd9017d532aef516db0be2b9fee1314f2dcacaee833daade2326bf724bcd439847cc4e7c5fcdd93759db3fd16f569b5f73f80ef'
             '4eedb9af024132bf9556eefe067c3afa31f213dd219645cb82c4be532461387d8c78ec3af623fa10db8ba2803b06ceb4bda09d968529196919163a8b0c166e03'

diff --git a/eos-pkgbuild-setup/assets.conf.mirrors.mirror1 b/eos-pkgbuild-setup/assets.conf.mirrors.mirror1
@@ -169,7 +169,7 @@ PKG_MAKEPKG_OPTIONS[eos-plasma-sddm-config]="--nodeps"
 PKG_MAKEPKG_OPTIONS[eos-sddm-theme]="--nodeps"
 PKG_MAKEPKG_OPTIONS[eos-settings-plasma]="--nodeps"
 PKG_MAKEPKG_OPTIONS[kernel-install-for-dracut]="--nodeps"
-PKG_MAKEPKG_OPTIONS[calamares]="--nodeps"
+#PKG_MAKEPKG_OPTIONS[calamares]="--nodeps"
 
 #PKG_MAKEPKG_OPTIONS[calamares_current]="--rmdeps"
 PKG_MAKEPKG_OPTIONS[eos-quickstart]="--rmdeps"

diff --git a/eos-pkgbuild-setup/assets.make b/eos-pkgbuild-setup/assets.make
@@ -258,7 +258,7 @@ Build()
     Pushd "$workdir"
       cp -r "$pkgbuilddir" .
       pkgname="$(PkgBuildName "$pkgdirname")"
-      Pushd "$pkgdirname"
+      Pushd "$workdir/$pkgdirname"
 
       # now build, assume we have PKGBUILD
       # special handling for missing dependencies