Parcourir la source

Merge remote-tracking branch 'refs/remotes/antonym/master'

Chris Murray il y a 9 ans
Parent
commit
43eff225ef
5 fichiers modifiés avec 12 ajouts et 11 suppressions
  1. 1 1
      README.md
  2. 1 1
      docs/index.md
  3. 1 0
      ipxe/local/general.h
  4. 1 1
      mkdocs.yml
  5. 8 8
      script/prep-release.sh

+ 1 - 1
README.md

@@ -61,7 +61,7 @@ Full documentation is at ReadTheDocs:
 
 #### Feedback
 
-Feel free to open up an [issue](https://github.com/antonym/netboot.xyz/issues) on github or follow us on [twitter](https://twitter.com/netbootxyz).
+Feel free to open up an [issue](https://github.com/antonym/netboot.xyz/issues) on github or follow us on [twitter](https://twitter.com/netbootxyz).  We're also on [Freenode IRC](http://freenode.net/) in [#netbootxyz](http://webchat.freenode.net/?channels=#netbootxyz). 
 
 #### Testing New Branches
 

+ 1 - 1
docs/index.md

@@ -77,4 +77,4 @@ Under the Utilities menu on netboot.xyz, there's an option for ["Test netboot.xy
 
 ### Feedback
 
-Feel free to open up an [issue](https://github.com/antonym/netboot.xyz/issues) on github or follow us on [twitter](https://twitter.com/netbootxyz).
+Feel free to open up an [issue](https://github.com/antonym/netboot.xyz/issues) on github or follow us on [twitter](https://twitter.com/netbootxyz).  We're also on [Freenode IRC](http://freenode.net/) in [#netbootxyz](http://webchat.freenode.net/?channels=#netbootxyz).

+ 1 - 0
ipxe/local/general.h

@@ -1,3 +1,4 @@
+#define DIGEST_CMD            /* Image crypto digest commands */
 #define DOWNLOAD_PROTO_HTTPS  /* Secure Hypertext Transfer Protocol */      
 #define IMAGE_COMBOOT         /* COMBOOT */
 #define NET_PROTO_IPV6        /* IPv6 protocol */

+ 1 - 1
mkdocs.yml

@@ -18,4 +18,4 @@ pages:
 - Provider Usage:
     - 'Digital Ocean': 'usage_digitalocean.md'
     - 'Rackspace': 'usage_rackspace.md'
-theme: flatly
+theme: yeti

+ 8 - 8
script/prep-release.sh

@@ -50,14 +50,14 @@ do
 done
 
 # generate EFI iPXE disks
-#for ipxe_config in `ls ../../ipxe/disks/`
-#do
-#  # Remove general.h options for testing, doesn't like COMBOOT
-#  rm config/local/general.h
-#  make bin-x86_64-efi/ipxe.efi EMBED=../../ipxe/disks/$ipxe_config
-#  error_check
-#  mv bin-x86_64-efi/ipxe.efi ../../build/ipxe/$ipxe_config.efi
-#done
+for ipxe_config in `ls ../../ipxe/disks/`
+do
+  # Remove general.h options for testing, doesn't like COMBOOT
+  rm config/local/general.h
+  make bin-x86_64-efi/ipxe.efi EMBED=../../ipxe/disks/$ipxe_config
+  error_check
+  mv bin-x86_64-efi/ipxe.efi ../../build/ipxe/$ipxe_config.efi
+done
 
 # return to root
 cd ../..