diff --git a/xnba/binary/xnba.efi b/xnba/binary/xnba.efi index ea7fc93..edcb4be 100644 Binary files a/xnba/binary/xnba.efi and b/xnba/binary/xnba.efi differ diff --git a/xnba/debian/changelog b/xnba/debian/changelog index d7b5fea..3da9dc6 100644 --- a/xnba/debian/changelog +++ b/xnba/debian/changelog @@ -1,3 +1,9 @@ +xnba-undi (1.20.1-0) unstable; urgency=low + + * Debian build for xnba-undi version 1.20.1 + + -- Casandra Qiu Mon, 16 Nov 2020 15:49:48 +0800 + xnba-undi (1.0.3-7) unstable; urgency=low * Initial Debian build diff --git a/xnba/debian/control b/xnba/debian/control index bf1d82f..3d67a7d 100644 --- a/xnba/debian/control +++ b/xnba/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: extra Maintainer: xCAT Build-Depends: debhelper (>= 7.0.50~) -Standards-Version: 1.0.3 +Standards-Version: 1.20.1 #Homepage: #Vcs-Git: git://git.debian.org/collab-maint/gpxe.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/gpxe.git;a=summary diff --git a/xnba/debian/files b/xnba/debian/files index bd41b10..de9918d 100644 --- a/xnba/debian/files +++ b/xnba/debian/files @@ -1 +1 @@ -xnba-undi_1.0.3-7_amd64.deb admin extra +xnba-undi_1.20.1-0_amd64.deb admin extra diff --git a/xnba/debian/patches/ipxe-branding.patch b/xnba/debian/patches/ipxe-branding.patch new file mode 120000 index 0000000..2c8c4e9 --- /dev/null +++ b/xnba/debian/patches/ipxe-branding.patch @@ -0,0 +1 @@ +../../ipxe-branding.patch \ No newline at end of file diff --git a/xnba/debian/patches/ipxe-dhcp.patch b/xnba/debian/patches/ipxe-dhcp.patch new file mode 120000 index 0000000..6a2b121 --- /dev/null +++ b/xnba/debian/patches/ipxe-dhcp.patch @@ -0,0 +1 @@ +../../ipxe-dhcp.patch \ No newline at end of file diff --git a/xnba/debian/patches/ipxe-machyp.patch b/xnba/debian/patches/ipxe-machyp.patch new file mode 120000 index 0000000..9248f9b --- /dev/null +++ b/xnba/debian/patches/ipxe-machyp.patch @@ -0,0 +1 @@ +../../ipxe-machyp.patch \ No newline at end of file diff --git a/xnba/debian/patches/ipxe-xnbaclass.patch b/xnba/debian/patches/ipxe-xnbaclass.patch new file mode 120000 index 0000000..a833978 --- /dev/null +++ b/xnba/debian/patches/ipxe-xnbaclass.patch @@ -0,0 +1 @@ +../../ipxe-xnbaclass.patch \ No newline at end of file diff --git a/xnba/debian/patches/series b/xnba/debian/patches/series new file mode 100644 index 0000000..ef32fe3 --- /dev/null +++ b/xnba/debian/patches/series @@ -0,0 +1,4 @@ +ipxe-branding.patch +ipxe-xnbaclass.patch +ipxe-machyp.patch +ipxe-dhcp.patch diff --git a/xnba/debian/rules b/xnba/debian/rules index d11cd1b..10d9916 100755 --- a/xnba/debian/rules +++ b/xnba/debian/rules @@ -12,7 +12,7 @@ build-stamp: dh_testdir # Add here commands to compile the package. $(MAKE) -C src bin/undionly.kkpxe - $(MAKE) -C src bin-x86_64-efi/snponly.efi + $(MAKE) -C src bin-x86_64-efi/ipxe.efi touch build-stamp @@ -33,7 +33,7 @@ install: build # Add here commands to install the package into debian/ cp src/bin/undionly.kkpxe `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.kpxe - cp src/bin-x86_64-efi/snponly.efi `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.efi + cp src/bin-x86_64-efi/ipxe.efi `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.efi #dh_movefiles diff --git a/xnba/rebuild.sh b/xnba/rebuild.sh index ab4b9a8..1527439 100755 --- a/xnba/rebuild.sh +++ b/xnba/rebuild.sh @@ -1,10 +1,10 @@ #!/bin/bash -tar xvfj xnba-1.0.3.tar.bz2 -cd xnba-1.0.3 +tar xvfj xnba-1.20.1.tar.bz2 +cd xnba-1.20.1 cp -rL ../debian . dpkg-buildpackage -uc -us -aamd64 cd - -rm -rf xnba-1.0.3 +rm -rf xnba-1.20.1 cp `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.kpxe `pwd`/binary/ cp `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.efi `pwd`/binary/ diff --git a/xnba/xnba-1.20.1.tar.bz2 b/xnba/xnba-1.20.1.tar.bz2 index 4fab6f0..5d90975 100644 Binary files a/xnba/xnba-1.20.1.tar.bz2 and b/xnba/xnba-1.20.1.tar.bz2 differ diff --git a/xnba/xnba-undi.spec b/xnba/xnba-undi.spec index b79bf12..1acbcc7 100644 --- a/xnba/xnba-undi.spec +++ b/xnba/xnba-undi.spec @@ -25,7 +25,7 @@ The xCAT Network Boot Agent is a slightly modified version of iPXE. It provides %prep -%setup -n ipxe +%setup -n xnba-1.20.1 %patch1 -p1 %patch2 -p1 %patch3 -p1