create_$ARCH_diskimage never really took off. Collapse back down to

just one.
This commit is contained in:
Warner Losh 2014-08-14 16:17:30 +00:00
parent e535d017c0
commit d4f4d3e5cb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=269984
3 changed files with 2 additions and 20 deletions

View File

@ -261,11 +261,6 @@ die()
exit 1
}
create_amd64_diskimage()
{
create_i386_diskimage "$*"
}
# Automatically include the packaging port here so it is always first so it
# builds the port and adds the package so we can add other packages.
add_port ports-mgmt/pkg

View File

@ -487,7 +487,7 @@ populate_data_slice ( ) (
populate_slice "$1" "$2" "$3" "$4"
)
create_i386_diskimage ( ) (
create_diskimage ( ) (
pprint 2 "build diskimage"
pprint 3 "log: ${NANO_OBJ}/_.di"
@ -649,11 +649,6 @@ create_i386_diskimage ( ) (
) > ${NANO_OBJ}/_.di 2>&1
)
# i386 and amd64 are identical for disk images
create_amd64_diskimage ( ) (
create_i386_diskimage
)
last_orders () (
# Redefine this function with any last orders you may have
# after the build completed, for instance to copy the finished
@ -1106,7 +1101,7 @@ setup_nanobsd
prune_usr
run_late_customize
if $do_image ; then
create_${NANO_ARCH}_diskimage
create_diskimage
else
pprint 2 "Skipping image build (as instructed)"
fi

View File

@ -106,11 +106,3 @@ last_orders () (
-o bootimage="i386;_.w/boot/cdboot" -o no-emul-boot _.disk.iso _.w/
)
)
#create_i386_diskimage () {
# #currently not used
#}
#create_amd64_diskimage () {
# create_i386_diskimage
#}