From cc00d7a5efc7ca27ffde4afa1ef3aec9a084fd3a Mon Sep 17 00:00:00 2001 From: Amy Bowersox Date: Mon, 9 Dec 2019 10:14:20 -0700 Subject: [PATCH] changed the splash screen and added a test to make sure we run as root --- src/splash.png => resources/splash-erbosoft.png | Bin resources/splash-vmwcblk.png | Bin 0 -> 8055 bytes src/Makefile | 8 ++++++-- src/config.c | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) rename src/splash.png => resources/splash-erbosoft.png (100%) create mode 100755 resources/splash-vmwcblk.png diff --git a/src/splash.png b/resources/splash-erbosoft.png similarity index 100% rename from src/splash.png rename to resources/splash-erbosoft.png diff --git a/resources/splash-vmwcblk.png b/resources/splash-vmwcblk.png new file mode 100755 index 0000000000000000000000000000000000000000..1b33a4e17b5792f627d177d70d1ee9c7d9fa564b GIT binary patch literal 8055 zcmb_>1yGw^w=RVWZ7Eu$P@p)4VntHC4W+nCaCdi4XiI<=*WyqlxVwcEcPZ|aV#R_5 z3j|KS```KRckX;M=ggTi^S)~`&))0ZYpuQ4-p|_ks;VsWxru>V=D&vz4ubB@PaIEI3wJ7VjNZFoHSk0SSr57aa$Z zGJ-E*I`U7Yd0)ugt>{>a{0j7X(n3O`(5_v1Xw&+L#@><3;oiGLoT{oi^;#0$TRGf^ zX3wcM*M?hrhiDGzt&|4Kw(ks%h#plH3W@WVOu>osK2dy^0xTK4;!DljxoGVym|plY zPz*ti{!GyGP&%~jkg^)-f6RkVRJ!3F<{d1x8J9^aL5B2N|J*?&4+y(1exqT67$6Yt zzo>MP)fv>RRBPXiGkO07ze0VcKYf5`@tgp|yYoz*+GU9!z{z&% zSN#W1+M>h`uBdQTTx^ptoT0oI3}|iL$MkPc?x!0k3YtIQ7Ruh|D-iX2_oxq5FmdR` zu_Az11{iw-+AFIa?H6Z;m3+0IT?j3YuowmTdV?*UZ!=$>p5wiOyM-^kZQj97%0m}f zU3VNDZl=H9J3cT;FD&@LLrzKh!5YCsk_V5pBW6;t&@&Hd9S&aA?it-oMlIncrWuHPAf$egAMJB~o|xU5Jv&Y>2eb9bL`4 zB&6-+xdQwO8a4X1^(86!Wk&nj`Ifq=mS*{^jH&BUoGmX}_O3<<2zUo?yWdfTu<)KP zUm-@%*B*;6q`Pm5Z8bzam2{)I^YK=hU=bJRE)@>33C`P(cm5@D?%e+i`j^B)|8B-Y z*iQe@@XvaG|KR_w-hVRW-**0ey#Iy+|5LrcN93O!H(5H*)VC6DdXsFusqGLkNDEO= z!7J-tHRE)bB4=m{p2}idpYnR?KXX6jp&787A|Ji96c(1cnM?VITU*Y5Ce?+iq+_p} zks-R*)+UbGhzBiPqm22rIxP}>N*kxyjefdd<(`NIeLD(xlxZ zMwq6iz5ppJH!obW{(`d86N#s>q<&1pVu*KMO;*V&O6@v36w#s-M91H!Xd)OA_#&4u znl<8Xcl4qceG4s^OF(Qk{^rV=twJ2WJD{qM^mXcJm6a@~DDakZFF}RQKHiO5IuhJ; z@@42+(H}D7^Pd?Y4;!4RNxJ2)GR(eq(EWiTR&l(eg84Yt1fxNSkp(sc6IYA(fG;N| zs8i=ZYwvMws}fwJHpqq~!E7Nph38(^^_YPEA5Sg_ILt>$HOPXT1C*a4n+m^km#1)vJXY(I7A)Y4$D9`Z; zau3fzkmJSnuYEtiL87hZ_aS~^rBH$oDrE)r<(K29qBLiQ2jVBRDtHMFj!n?-s%d#+ zt!wkCwC!UbBSt*y$Cok{qkKZ+xggisSFufWO@;^gy>m5A`Dx*iJ$y<%e`I9t-9?AZ zKs*v4$qug~J?a1{ADYU%2+R*tvT zkkN8wLjT@e%JDHj6HL9^RQ)zZdcq>mn#>%NJuSiK|GSAZ<#9brF=9zkiC{=6k~uCa z)LZ)l8W-C?QNDXkEO~ktbGK1LE@7Zegg2|8&Z@0!(nXi{M+ z(J|+`$7_G;c`wa4ldb_hcCb~=)ER)!pmE)0@%G~-!GL-Cmz$Q7*@4vF=Q{GCDqhGU z4Q4A6AayFUJgm4lpHHxc{lLl5Fg~H*;>#<7fJJF1ZpQmTsS=*o0HwH%m6geBGn9}0 zx8R8bCfkYqi)-|k=U9?F2NIdMg%J9il>GLLLGMU_^9z>V3iizEDdmJKJ@S2P zZi>MnG&4h0HO;7wHvQWm!J(0Ijg2(ll z+_Md@T_BntW3!Q=Ji$u3w^vKmA_^Ko#{;b1Y=dkP;-Yc-=iM4cDnpsFYMP*i>+>6W zu4yZ0KkgT1J3cUVUA3ia#N7MRB1bo)%iNxhQ3@Zi1{03>_GF56r^+k0c!N^}xe2fj zIlD`SF-SglvvjgU*;Us0(N0ag9bA|&0w+}jUU&Ar^~V~4?r4Dt((g-vU*sb11%}Un z#8{tCRFJYK4zx+cG_Jl^{t|35QEa`-?-&E)8hqlVOWw@$a^ zqPtbBhK5UNx1IsL!EI^8c17ZzaWo8hjkO=d;qc744CZ=4clWBJv&z7ZsXtRv&prV& zVGNRI%AK-p!A(*3Rist&+2vVx{hWKNc*+xsDuxq1Brh+!8>$DjIF4P-V$sFhLd~)9 zd!<|vcg4!IzrNxx2#^70_PDq9fg>I~Qh>TYQ>p%BH9Y)27Cln_O~TX6nK|8G^&5_B1)P?2Pu0t~Zm| zA~RmM8>xiOOpZg)Zpem);+st=1lk0B;VQIDcNQQ4kj(>B@|7}l0eMCHj4W(Rxqiv# zRquT+=2>&+6d@0C+RN|N73rL7|IoKuiOoYwX9}=qT>!K7sZ}9Y^k5D<2U4$p*l(`$ z$su;Uh|(4#CoeGh=JwhY-u1wm(GD%>G_ve~zTW`gosNFD?$)iKADvkeLkjdVEcsPA z3OU?d+o9>oY;0bAPsp%t5G-In@pbYb3*^kdyW{eZK{8_?os92OyNTklC$rt1`Z2R8 z_i9FH-ZFO%KKbi@r9G4FoI$k%*A(hMiuh{m30EpsQR~HlA}Ms_n^O3$wdABZbLWtY zF0E4(De&9KkwuLzGzKFR7vlH*{Kn6-w?*iwbhp?hgnidQUFkv5Gh3Ry!~!;3*I8%` zxQbF>d|@}Y29wj$rO@an_a&n*z1;1*mg%!N<%naz?!+2mQ{b$Qlu4{W*(+&~Jd}I? z`YfaG24K`n!Lbu-NhwTWP%sw3rcHa@&dsB2o{hPnA0(5sIS;z>} zp8O2ia_qEmC8|;qSX-ldI6uG+?5l7E83&HM$MA*Y)6#>vMA4lSfi>3Uu)2&J1*ruW zaTmUk4;4IV9A1?c#Zz|*l#UGEupPn!yTMuN;+2D5%3XIQR1`3{Nt9Y`h!a%oVvnf= z`&r^k4|85&_^-8#)>z{{Oheu|Jv{qn)OBPU%VprkS}q?;(DRbq76he*0(G)~P~%Zc z#W90d@F{NC*+zD~g02RjFYR@9V_juqD)Da{>s80u8Ru5JW~QuB7HGOy5_up)8gWjy zDNne|4ky2_B4rghL*Dm7b&P-?qDe{Z_dXwT!F&-Q{WXi$*>2c8lglo9R8=Oe#FuN> zvE+fkYr}5yhYVb0>XEprO8@{zS}F^a*gtl=5Q)%9+h65iglcL|A*j>%I^a9{7L4{9 z_k)UyZCk&k`)})M+xl`bbSc_2Vlr&1g#2SbL(PTQnQ#lv$tz_ocw19@y*JFx0}xFq zMe8jEAI^7vJhDS>sq z?I&$kc#`NU6BQmn%Qx-qeNmRnU~;$M&pCzPac0DM6t6|MGb{$q-Ey4`J2!UDOzU4c zJ2cesS-z$c^i%?`QyXg*7Rj?Tf#{wibW7j{!CdJ5HaUqDOnSaPb1V@LGB|+@vi%@eD_J zAJq11IIqz9tOT2*ws8=&R)C?51X)o6R9z&2hm7Z~wMyl>3pR7sQ8}>(cZL+d0OZ#&8Pc!CGDc=WL_fd`d&~xIWTgb8C0|Eq*^wsgL=UoZn=|=ywV5fW4YW z%*WBCL-omSElC@c*&mw|Wfs&{sF-{#~p6y>jlN^OM?qSAfb(!}k}aZ%CVf9!;_-hr#fIA8VcpQ?mJY?NCEA6w_o{jYVbP%)<9B}I{$ua*A6TjwOn3Ok3p;3kZ@?3d0RnRVK=#&A zK)DDcBT}^GtVp?PLOD*&M z<0TM~wRvaPwxvbKb~5H=SaUpx;%uZUI}V^wXF(Vc58mIZhV#+|pZ1$a$WD_Q-r6=KRuh7LS(9e5|SPYCJ_{Hes3FsE8(4)^b%ut6K+Z)wbUK0@~qLITs7cYYf)COz}{Ri4aBpjLYVg3 ziB%xaUI%4wuMFj3$jh!e?QbyO_I?Kbbo(X-NSH_9dAP6A$P-4G!@lEWI~>0oMKDzk z(YdqyH0#{MgGoF}9{=YAd8=^mshM30`h_Z%wHQBe7MqM}tj!-uZ+-0zip?m~{T`E~ zIZ?$iuB#BPgfDz7qf#+dRg;2^yn~Q^Kf%^IUJ-Zmb2M{}oBVdtW9)oi>?n%BK~9Tv z*TcS%1Bt;D{PQyb6Z5{$&t3q^8r@=c;Oa0&Xsz5lXYoz5#*UtRdtrGh<0RY&t=4cK zgid+jGxulvP(-A8pd@X?fTyU?Zfs^^dWP0wv-4)9oKT}k;Z0JxnoTXI7TZXETdTn5 zc9Zu?wW1nvXAX@_(IwLOms~eJKZM;&&e&u^{GQQlU;53Hjr07_ZA!hPFj$@}o<$YJ}&lkd0bk=eH(#2w?QZqK2$K^JaJ9X3uBh1w9R(_@~mEmYnA8#j^3^ z0YCoiY$SZ4j=8h|fV$Y$hi_vP^sPmC^r;3+RLQlTgiq79A%Ib*fKIZk1U z%20TuDtK~BTknQQW-@ddwAd{-}OQ=%?U zmY1i`JK0;G`kjiyw?m;w$qMlAsDwd^u&uEctEsx+?7p|x`3hargw z0aIZ4I`$yCi1v1wSo^Zih0g$(cr?`@H^R;co&7q58{GPJIm%=1qQ5Bf4l@sBc;>;c zy%<`c9>MF5SVuiMUoP<;3JX@BUr7NwR>DiUoBQ07xKKCu{S3^`dGw`KTUa zNm6gYBXvKgcTFD-q)4zt(z42o8xN-YzM!kWTz0LF_58NLcm zETs+CkMi;!Y|=|lRJkCkO9`epDT(~4OlYpfq2&a*Jc91Z{4URg$9&7sFIL+%tx1Lw z!_?;%`Et|~atgPy9>KC$2t(nUFA-O5-w-sv=D9bTI2)!$Bg$LOG(Wk?|9MDCr0*##vOKA1G^QrFJker_bkPPhb5A zWmdRUh@0-i5{i7_=NWs8T@dRZbd@2`7~WerqLmw$WW980)+`+gOR&q}`UVA^ff%Bu zHo9Blt-t}({z?wo%G;QXkcxPhUmY$)6aE<|>Ofhrxyr%JIL_cZA~S9QW@v4lr&xsT zLJ(+r{JFr3jtjw13W%@o5i)Nsixpii9>57Vmebc*k;gaX zrHb!;D5H03$yZ`WtuSDR&oJ>>Y$ej=;{0wh@$r!gK-3~g5{2kmVvZgtI?+WbMLass zRzNi7P(+?PNo$ESFmnv0bz6`Em9JB#Kul!^b8jp@FR6CV#3lFViogOhU$U1JGC>tH z)+IE1uuCNEHb4w>a?k6t8o;_OQc0aX@u@V%Tu!HU)@96*qA6OJx4huKy}c#SySDXI zfBNH1{gs1au(Ahr9)xO~|BDZ2$!B6Wk)n^>tMplXkY7E60YmSn^Pw^6pO0nEYG)tn z_%&azHjpf&k^<+MX|bCQQDBR*(MSOsf=8f2=8hz)^#kaLDKV6 z5y*3c_Qc)Reu{BSi*0&4kAA5Sks)c^q!+j6w>2%$RZT;-ITo2m!yr?ih?lVW!7%9j*dt@?*LoSu+;k~r&s*3FS~>{fSnPQjl- zkSKpD<*;&acNudWjiHx>RTRK&AY(p&v^@RGxHDxL{nZ2<5ZXGeSJ`mp0(OpPYEkIF zk=sNKAH#07e?(X2rZB_V_EP))+uEi+m6YM#*J${qdm_qRPQZyC%WIifUiKf-`af#wNJHA_78VRE)QgI#{i`ci-$x~t zX!S7zu&XY*Bxovd_v{aDx(>JS_0^R0NswRCqT=v^fXRp1w#VHi6bb|=|FG0N{nTI! zz3C;Ktjw9q9}m^H$~P~3&IHIUs>?gSdJA|-28fvNSPXO+)&VfbM1+}-WVc+c8PM$YWM;tKJJ$yamU7r&>;gu5AxpfQBHqiHZD##}^n zYCgl3q?1IVvF6WKFWbW0jC;`~u%9qpJ)^6Q8+XxoB;xE1SfOJC%e1WS9sBB0Sbe}g z7-M(Z2hoPQVBQSkV0`w~4mzul9`}V&qo*lRbyQ?@dvy{e4ujij1njTpqE?C4mAheDkMf2C zxJ$B&_B*CZt-Y^b(u}RHT1In+6$fNQmbS_!eTB9&PR>s8vfg_w34r&A07EsHP?Ct3i0_O^ z&_$rd44p*EKwO>YfC$TY)I54q)OVv-g-x<$f9UI8vlIExgKx463k~#*+Kk(*(7Y|p zH2e4y(7|5oYXftJ+OB)rvU29{=77I?DRYpsb% zNzNYBwyDy6PN)E5q^%wqub!`=(dTZ{s0u2RkohZtMe#(3s-l@%zfGs?~CcRFA zJUy`CP~{+pk)KK$?-V6p=x$f)YI-_OEO)(|ms#G#rAyM%SU?@M>r=)flb_jb|nEE3WJeoiRI;oA$Q0Rf+PJ?%~WVH8z8whx*E={xdZ0RGEZ5 zf}X?uDJ+za(2+;8J8lj`p7uMbJd5n|C2<7qDjkMBwe@u~lY&Io8tU3fK9^^M3#3sN z=l;-+^hj*LI)0}z0sPvAgOb8gBKnc2dj?$f|L6L?$wzP(TOH_8+3>MzNqer{oPc?X zTJuNXN6&gRLkW!)u)Y>243~{3M06+_r=x!POBEmt-u>)YkE{Nv2(Q$cqpD9nqV(M_Kb2 zNz?)Q({7=}If4^@?)n!>V)F6U44)SVmjDMVU;OyL@*@r&7W$X`3;K667Q%M=hlYP? z|NnY_|KR_w-ro)Rf9Cvsy#LyP|Eb=8ipW1WPBd_P2j5yc>UB?N9QHq1964#__vJv7 G&;J2>_*m-z literal 0 HcmV?d00001 diff --git a/src/Makefile b/src/Makefile index 835818e..16b5f0c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,3 +1,7 @@ +BUILDUTILS=../buildutils +RESOURCES=../resources +SPLASHSCREEN=splash-vmwcblk.png + OBJS=main.o sysinput.o ep_init.o ep_upiwin.o ep_backlight.o ep_upiwin_tmp.o ep_util.o fbinit.o fontengine.o fbprimitive.o \ log.o gpio.o msg_queue.o time_func.o config.o splash.o LIBS=-lpython3.7m -lcrypt -lfreetype -lbcm2835 -lpthread -ldl -lutil -lm @@ -18,8 +22,8 @@ splash.o: splash.bin objcopy -I binary -O elf32-littlearm -B arm --rename-section \ .data=.rodata,alloc,load,readonly,data,contents splash.bin splash.o -splash.bin: splash.png ../buildutils/mksplash - ../buildutils/mksplash splash.png splash.bin +splash.bin: $(RESOURCES)/$(SPLASHSCREEN) $(BUILDUTILS)/mksplash + $(BUILDUTILS)/mksplash $(RESOURCES)/$(SPLASHSCREEN) splash.bin clean: rm -f upiwin *.o splash.bin *~ diff --git a/src/config.c b/src/config.c index 5345597..cc2b67f 100644 --- a/src/config.c +++ b/src/config.c @@ -187,6 +187,12 @@ HRESULT Config_setup(int argc, char *argv[]) HRESULT hr; GLOBAL_CONFIG from_commandline; + if (geteuid() != 0) + { + Log(LFATAL, "upiwin must be run with root privileges"); + return E_ACCESSDENIED; + } + if (atexit(run_exit_funcs)) { Log(LFATAL, "Unable to set up exit function mechanism");