From 316e83b905c496e5104b61db3a7705fd1f7fee82 Mon Sep 17 00:00:00 2001 From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com> Date: Fri, 19 May 2023 05:20:41 -0700 Subject: [PATCH] Fix fix on 2004/gavin/fs.tar The tarball, whilst in a subdirectory, did not extract into a subdirectory so that if one did tar xvf img/fs.tar it would still overwrite the files. As well make clobber would wipe the files out. This does mean one will have to update the tarball if they are to use it but one presumes that they would know how to do this. Note that kernel is still under img/ but it's not part of the tarball and it's supposed to be outside a tarball too. --- 2004/gavin/README.md | 5 ++++- 2004/gavin/img/fs.tar | Bin 31232 -> 36864 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/2004/gavin/README.md b/2004/gavin/README.md index f86f14918..d3e441fdc 100644 --- a/2004/gavin/README.md +++ b/2004/gavin/README.md @@ -67,7 +67,10 @@ Press and hold any key. [Yusuke Endoh](/winners.html#Yusuke_Endoh) provided the `kernel` and `fs.tar` files which can be used if you cannot normally use this entry. Instead of generating the files just use the files provided, found under the [img/](img/) -directory. +directory. Note that the `img/fs.tar` extracts into `fs/` so you will have to +fix the tarball; this is done to prevent extraction from the entry directory +overwriting the files and preventing `make clobber` from wiping some of them +out. Thank you Yusuke! diff --git a/2004/gavin/img/fs.tar b/2004/gavin/img/fs.tar index d332838809f570e21ccc065a2fe563071bf0329c..92cc37a0b419dd19e4bd6c580da48521c9dd2731 100644 GIT binary patch delta 2731 zcmcgsdu&rx7(e&+ZtWDhjscVLx*G*M#@gH4+YTZSHraT(!Ny=vCysT4g@rx3%F9_s zMJ=Hk(%Hm#K;UWPB(PXMTt?azwhpLBkCXiqbK>!?>pb) z_kHKwbMAo=?m#bZsPj9b)zhn^K1G}+Ns{PP6qnQEQQU4tl$=hFi{bK&ALSC& zl!Eqm*0$`bZHS)C^mh4XXFA6}jpB4GGCqx*Kh`~cnqX#4&2~{tNl%+N#hh+V&rD+_ z1*-~+d?u!?SxR8nb`$&0qJsZpNl_GS)>FqJhoNf27PPi2iN$3M(i51l{~HA9)Y8kB z$sx3)}&;+N{r>1LlGFPT&HF0Lg-2*X{2S>Vugq9K+bWrEGn0C|2?GpnavUrJRYI zw^XhxTmM50z5_e?6pFcFOwe>yRoPjt^rfVNb?e_?mLu<;w|Fa;owuBo(q2qHZ?T8% zR`#1cm7BGbVV*h(!7P;SQtBgfmLWq_XVudCZ$iFGBx9tX_kpI8C$=p zsBFXLidCiS_P5Pv1?9_&SFBvUX6#=??2CYWiVkGiuKcI1mA@mGhr6c&B3 z+>sG#GqKb|Z31Iw4`|+#qwo*N;k~k{efeMezGB>PuW<*aU;>5O{bT> zTht%t8GD7ILv8)+zO;^t{?r!^ik*T<5mR43H)srhkz3T?!NP)d!2K)E6Zx~8^Hjog!HFf=Hr@eTv5fssmYRgB^Xs55VSY`PKMlnuYuF!bM{%+i~@P7lFyZR^Uy*YRJuu zRWS>cDG(ZTQo|s{E!6CjfoYHoNCSvT_W^Op+Jj2h@w%!uE{7fWrjeS#g>3X--IXTg z!bT5{C6M&Vs6j~MX~ew@ff|i@ZP9nU^ZrSKTJQ|a)Er~9H^$;f%+|EgX#s#|8TfyU z`soy?X*w0`mW})+o=%Ntr^n)dK|GyS7ve_iV1bdvP@iY}p`Jje_d~X>D&6XD_0{j% z8t~Wpw5Z*f_3r2twC;Walilv{@Adm?oBWP?*Fuk@wxQ19Z>?@=wU;x;wm^M@Z*=xK zwl~yotI3n?F1u{^`JJQYJlxIN;Eg^_aZB3uu>Xd zLf*Ml!H_-5(0~Io*g|A^5)+rqdvMVVImF4IB6WT*Ilo3GpTyseEJH5Q^H(Ty!D~>3 z`dzI|NaBwXd!ANEA*XzaGJl3OXiDNQq7Q>>h)grVVlwhY6n`59@fF0on4J6|Ss&6= zg{)zX@B$GY)>M^OWsbcYA%)P SqAesniU^aTJNXGNAp8lZL9Z78 delta 424 zcmY+Aze)o^5Qn|Jup5mDS6Wz{pzV3Lf6iJkU=t7v6$HTR%>vLa665UNkSW$&_Yq5bhP1b*v=k;LOfX z#}>x3!*=Wf;ZgCjszbw`W1SY>B0Lc^aj$3B?G(-H0~HY5m7+Q_6m5^9hV9tkr>+ok zDU_-7dI9t74q=}RM$2G0a0BwcP1gK%r2qYX>d!Cf&i0Gw0Oncn#|_E9%HBWIWuAQl DP=9;1