sysMenuVersionファイル内のパディングを整理。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1823 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yosiokat 2008-07-08 13:35:34 +00:00
parent 67799b6f1b
commit e426a5b8dd
4 changed files with 28 additions and 11 deletions

View File

@ -78,8 +78,6 @@ MAKEBANNER := $(TWL_TOOLSDIR)/bin/makebanner.TWL.exe
MAKESYSMENU_RSA_PRVKEY ?= $(SYSMENU_TOOLSDIR)/openssl/rsa_private.der
MAKESYSMENU_RSA_PUBKEY ?= $(SYSMENU_TOOLSDIR)/openssl/rsa_public.der
MAKETAD ?= $(ROOT)/tools/bin/makeTad.pl
#----------------------------------------------------------------------------
### Global Library resettings

View File

@ -22,6 +22,9 @@
# 現在、製品版の証明書を含んだものは生成しない
override TARGET_PLATFORM := TWL
override TWL_ARCHGEN := LIMITED
TARGET_FIRM = SYSTEMMENU
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
@ -31,9 +34,9 @@ include ./commondefs.sysmenuVersion
VER_TIMESTAMP = 08062300
# システムメニューバージョン
STR_VERSION = 0.1A
MAJOR_VERSION = 0
MINOR_VERSION = 1
STR_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
# ユーザー領域サイズ(=128MB)
USER_AREA_SIZE = 134217728

View File

@ -73,15 +73,21 @@ if (exists($ENV{"TWL_IPL_RED_ROOT"}) ){
die "No TWL_IPL_RED_ROOT is found.\n";
}
# バージョンの出力
# システムメニューバージョンの出力
{
my $length = 0x20;
my $sysMenuVersion = $ARGV[1];
if( length $sysMenuVersion >= $length ) {
printf "ERROR: SystemMenu version length less than %d.\n", $length;
die;
}
open VERSION, ">$versionFile" or die "File Open Error.\n";
binmode VERSION;
# my $ver = ( ( $ARGV[ 1 ] & 0xffff ) << 16 ) | ($ARGV[ 2 ] & 0xffff);
# printf "version = %d.%d\n", ($ver >> 16), ($ver & 0xffff);
# syswrite( VERSION, pack( "L", $ver ) );
printf "version = %s\n", $ARGV[1];
syswrite( VERSION, pack( "a*x", $ARGV[1]) );
printf "SysMenu version = %s\n", $sysMenuVersion;
syswrite( VERSION, pack( "a$length", $sysMenuVersion) );
close VERSION;
}
@ -108,21 +114,31 @@ if (exists($ENV{"TWL_IPL_RED_ROOT"}) ){
# NUP_HOSTNAMEの出力
{
my $length = 0x40;
my $nupHostName = $ARGV[ 5 ];
if( length $nupHostName >= $length ) {
printf "ERROR: NUP Host Name length less than %d.\n", $length;
die;
}
open NUPHOSTNAME, ">$nupHostFile" or die "File Open Error.\n";
binmode NUPHOSTNAME;
my $nupHostName = $ARGV[ 5 ];
printf "NUPHostName = $nupHostName\n";
syswrite( NUPHOSTNAME, pack( "a*x", $nupHostName ) );
syswrite( NUPHOSTNAME, pack( "a$length", $nupHostName ) );
close NUPHOSTNAME;
}
# EULA_URLの出力
{
my $length = 0x80;
my $urlEULA = $ARGV[ 6 ];
if( length $urlEULA >= $length ) {
printf "ERROR: EULA URL length less than %d.\n", $length;
die;
}
open EULAURL, ">$urlEULAFile" or die "File Open Error.\n";
binmode EULAURL;
my $urlEULA = $ARGV[ 6 ];
printf "EULAURL = $urlEULA\n";
syswrite( EULAURL, pack( "a*x", $urlEULA ) );
syswrite( EULAURL, pack( "a$length", $urlEULA ) );
close EULAURL;
}
@ -139,7 +155,7 @@ if (exists($ENV{"TWLSYSTEM_ROOT"}) ){
# アーカイブ作成
{
system ( "$TWLSYSTEM_ROOT/tools/bin/nnsarc.exe -c $archiveFile $dataDir -s -E .svn" );
system ( "$TWLSYSTEM_ROOT/tools/bin/nnsarc.exe -c $archiveFile -A 16 $dataDir -s -E .svn" );
}
# アーカイブのハッシュの出力