Remove obsolete patch + general cleanup

4 files changed, 11 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6accb1f49c5..363af9ddedb0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pixiecore-git
 	pkgdesc = An all-in-one tool for easy netbooting
-	pkgver = r349.bdaec9d
+	pkgver = r350.fc2840f
 	pkgrel = 1
 	url = https://godoc.org/go.universe.tf/netboot/pixiecore
 	arch = any
@@ -11,11 +11,6 @@ pkgbase = pixiecore-git
 	provides = pixiecore
 	conflicts = pixiecore
 	source = pixiecore::git+https://github.com/danderson/netboot.git#branch=master
-	source = initramfs.patch
-	source = initramfs.patch.sig
-	validpgpkeys = 748231EBCBD808A14F5E85D28C004C2F93481F6B
-	sha512sums = SKIP
-	sha512sums = 6deb1f06a213cfe252c989e895d9370b3310c5308cb5de3b13c1441cfc83bbe7832717538e916563f18c550c4c79115da16e635746fa33cd9248b79939e6e483
 	sha512sums = SKIP
 
 pkgname = pixiecore-git
diff --git a/PKGBUILD b/PKGBUILD
index 7981b22d11fe..9b15adac4a45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,31 @@
-# Maintainer: brent s. <bts[at]square-r00t[dot]net>
-validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
-# Bug reports can be filed at https://bugs.square-r00t.net/index.php?project=3
-# News updates for packages can be followed at https://devblog.square-r00t.net
 pkgname=pixiecore-git
 _pkgname='pixiecore'
-pkgver=r349.bdaec9d
+pkgver=r350.fc2840f
 pkgrel=1
 pkgdesc="An all-in-one tool for easy netbooting"
 arch=('any')
 url="https://godoc.org/go.universe.tf/netboot/pixiecore"
 license=('Apache')
-makedepends=('go'
-	     'gcc'
-	     'binutils')
+makedepends=('go' 'gcc' 'binutils')
 provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}") # pending removal from AUR; upstream has no static versioning
-source=("${_pkgname}::git+https://github.com/danderson/netboot.git#branch=master"
-	"initramfs.patch"
-	"initramfs.patch.sig")
-sha512sums=('SKIP'
-	    '6deb1f06a213cfe252c989e895d9370b3310c5308cb5de3b13c1441cfc83bbe7832717538e916563f18c550c4c79115da16e635746fa33cd9248b79939e6e483'
-	    'SKIP')
- 
-pkgver(){
+conflicts=("${pkgname%-git}")
+source=("${_pkgname}::git+https://github.com/danderson/netboot.git#branch=master")
+sha512sums=('SKIP')
+
+pkgver() {
     cd "${srcdir}/${_pkgname}"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
- 
+
 # https://wiki.archlinux.org/index.php/Go_package_guidelines
 
-prepare(){
-    	cd "${srcdir}/${_pkgname}"
-	patch -p1 < "${srcdir}/initramfs.patch"
-}
- 
-build(){
+build() {
     cd "${srcdir}/${_pkgname}"
-    #EXTRA_GOFLAGS="-trimpath" \
-    #LDFLAGS="-linkmode external -extldflags \"${LDFLAGS}\""
-    #make GOFLAGS="-v" build
-    #export GOPATH="${srcdir}/${_pkgname}"
-    #export GO111MODULES=off
     go build \
-        -trimpath \
-        -ldflags "-extldflags $LDFLAGS" \
         -o ${_pkgname} \
         ${srcdir}/${_pkgname}/cmd/pixiecore
 }
- 
+
 package() {
     cd ${srcdir}/${_pkgname}/${_pkgname}
     install -Dm755 ${_pkgname} "${pkgdir}/usr/bin/${_pkgname}"
diff --git a/initramfs.patch b/initramfs.patch
deleted file mode 100644
index 7b29116f2eaa..000000000000
--- a/initramfs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/pixiecore/cli/quickcmd.go	2021-06-10 14:31:38.184997500 -0400
-+++ b/pixiecore/cli/quickcmd.go	2021-06-10 15:15:25.489444234 -0400
-@@ -331,7 +331,7 @@
- 
- 			httpSrv := fmt.Sprintf("%s/iso/%s", mirror, version)
- 			kernel := fmt.Sprintf("%s/arch/boot/%s/vmlinuz-linux", httpSrv, arch)
--			initrd := fmt.Sprintf("%s/arch/boot/%s/archiso.img", httpSrv, arch)
-+			initrd := fmt.Sprintf("%s/arch/boot/%s/initramfs-linux.img", httpSrv, arch)
- 			cmdline := fmt.Sprintf("archisobasedir=arch archiso_http_srv=%s/ ip=dhcp verify=y net.ifnames=0", httpSrv)
- 
- 			fmt.Println(staticFromFlags(cmd, kernel, []string{initrd}, cmdline).Serve())
-
diff --git a/initramfs.patch.sig b/initramfs.patch.sig
deleted file mode 100644
index 235ae8cde2e5..000000000000
--- a/initramfs.patch.sig
+++ /dev/null