Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xdmbgrd for openSUSE:Factory checked in at 2022-02-10 23:11:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdmbgrd (Old) and /work/SRC/openSUSE:Factory/.xdmbgrd.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdmbgrd" Thu Feb 10 23:11:34 2022 rev:21 rq:952717 version:0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/xdmbgrd/xdmbgrd.changes 2017-07-28 09:45:40.904836698 +0200 +++ /work/SRC/openSUSE:Factory/.xdmbgrd.new.1956/xdmbgrd.changes 2022-02-10 23:11:50.792173427 +0100 @@ -1,0 +2,14 @@ +Tue Feb 8 14:34:02 UTC 2022 - Dr. Werner Fink <[email protected]> + +- Move forward to version 0.7 + * Remove patches xdmbgrd-0.6.dif and xdmbgrd-piggyback.dif + as now part of the code + * Add and use SUSE Logo (bsc#1195675) + +------------------------------------------------------------------- +Tue Feb 8 10:31:13 UTC 2022 - Dr. Werner Fink <[email protected]> + +- Modify patch xdmbgrd-0.6.dif + * Fix bsc#1195664, that is use /etc/os-release to detect openSUSE + +------------------------------------------------------------------- Old: ---- xdmbgrd-0.6.dif xdmbgrd-0.6.tar.bz2 xdmbgrd-piggyback.dif New: ---- xdmbgrd-0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdmbgrd.spec ++++++ --- /var/tmp/diff_new_pack.g86zKv/_old 2022-02-10 23:11:51.340174814 +0100 +++ /var/tmp/diff_new_pack.g86zKv/_new 2022-02-10 23:11:51.348174835 +0100 @@ -1,7 +1,7 @@ # # spec file for package xdmbgrd # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,38 +12,32 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: xdmbgrd -Version: 0.6 +Version: 0.7 Release: 0 Summary: SUSE Linux background -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/X11/Displaymanagers -Source: xdmbgrd-0.6.tar.bz2 -Patch0: xdmbgrd-0.6.dif -Patch1: xdmbgrd-piggyback.dif +Source: xdmbgrd-0.7.tar.bz2 BuildRequires: pkgconfig BuildRequires: xdm BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %description The SUSE Linux background for your XDM workstation. %prep %setup -q -%patch0 -%patch1 %build PATH=$PATH:. -make XLIBD=%{_libdir} openSUSE=SuSE_Linux_6 SLES=SuSE_Linux_7 +make XLIBD=%{_libdir} openSUSE=SuSE_Linux_6 SLES=SuSE_Linux_8 %install if test -x %{_bindir}/chooser ; then ++++++ xdmbgrd-0.6.tar.bz2 -> xdmbgrd-0.7.tar.bz2 ++++++ Binary files old/xdmbgrd-0.6/.SuSE_Linux_8.xpm.swp and new/xdmbgrd-0.7/.SuSE_Linux_8.xpm.swp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdmbgrd-0.6/Makefile new/xdmbgrd-0.7/Makefile --- old/xdmbgrd-0.6/Makefile 2006-09-21 13:43:21.000000000 +0200 +++ new/xdmbgrd-0.7/Makefile 2022-02-08 14:22:53.383942933 +0100 @@ -7,7 +7,8 @@ COPTS = $(RPM_OPT_FLAGS) -funroll-loops -pipe $(LOOP) CFLAGS = $(COPTS) -Wall -DUSEZLIB=$(USEZLIB) XLIBD = -SUSE = SuSE_Linux_6 +openSUSE = SuSE_Linux_6 +SLES = SuSE_Linux_8 # # Force static linked libgz # @@ -19,20 +20,23 @@ all: BackGround -SuSE_Linux.h: SuSE_Linux.o -SuSE_Linux.o: $(SUSE).xpm - ./piggyback $(SUSE).xpm +SuSE_Linux.h: openSuSE.o SLES.o +openSuSE.o: $(openSUSE).xpm + bash -x ./piggyback -n $(basename $@) -h SuSE_Linux.h $? + +SLES.o: $(SLES).xpm + bash -x ./piggyback -n $(basename $@) -h SuSE_Linux.h $? backgrd.o: backgrd.c SuSE_Linux.h unzip.o: unzip.c login-pos.o: login-pos.c -testt: backgrd.c unzip.o login-pos.o SuSE_Linux.o +testt: backgrd.c unzip.o login-pos.o openSuSE.o SLES.o $(CC) $(CFLAGS) -DMAIN -D_PROGRAM=\"xconsole\" -s -o $@ $^ $(LIBS) -BackGround: backgrd.c unzip.o login-pos.o SuSE_Linux.o +BackGround: backgrd.c unzip.o login-pos.o openSuSE.o SLES.o SuSE_Linux.h $(CC) $(CFLAGS) -Wl,-no-warn-mismatch -DMAIN -D_PROGRAM=\"xlogin\" -o $@ $^ $(LIBS) clean: rm -f backgrd.o unzip.o login-pos.o testt \ - BackGround SuSE_Linux.o SuSE_Linux.h + BackGround SLES.o openSuSE.o SuSE_Linux.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdmbgrd-0.6/SuSE_Linux_8.xpm new/xdmbgrd-0.7/SuSE_Linux_8.xpm --- old/xdmbgrd-0.6/SuSE_Linux_8.xpm 1970-01-01 01:00:00.000000000 +0100 +++ new/xdmbgrd-0.7/SuSE_Linux_8.xpm 2022-02-08 15:23:28.712612444 +0100 @@ -0,0 +1,255 @@ +/* XPM */ +static char *backgrd_01[] = { +/* width height num_colors chars_per_pixel */ +" 283 245 3 1", +/* colors */ +" c #c0c0c0 g #c0c0c0 g4 #c0c0c0 m white s grey75", +". c #e0e0e0 g #e0e0e0 g4 #e0e0e0 m black s grey88", +"a c #828282 g #828282 g4 #828282 m black s grey51", +/* pixels */ +" ", +" ", +" ", +" ", +" ", +" ............ ... ", +" ..................................... ...... ", +" ..................... ..................... .... .... ", +" ............... .............. ... ..... ", +" ........... .......... .. ... ", +" ......... ........ .. .. ", +" .......... ......... .. ..... ", +" ......... ......... .. ..... ", +" ........ ....... .. .... ", +" ........ ...... .. .... ", +" ........ ...... .. .... ", +" ....... ...... .. ..... ", +" ...... ...... .. ..... ", +" ....... ...... .. .... ", +" ...... ... .. .... ", +" ..... ... .. .... ", +" ...... ..... .. .... ", +" ...... .... .. .... ", +" ...... .... .. ..... ", +" ...... ..... .. ..... ", +" ...... ... .. .... ", +" ..... .. .. .... ", +" ..... .... .. .. ", +" ...... .. .. .. ", +" ..... .. .. ", +" .... .. ", +" ..... aaaaa ", +" ..... aaaaaaaaaaaaa ", +" .... aaaaaaaa aaaaaa ", +" ..... aaaaa aaaa ", +" ..... aaaaa aa ", +" .... aaaaa aa ", +" .... aaaa aa ", +" ..... aaa aa ", +" ..... aaa .. aa ", +" .... aaa .. aa ", +" .... aaa .. aa ", +" .... aaa .. aa ", +" .... aa .. aa ", +" .... aaa .. aa ", +" .... aaa .... .. aa ", +" .... aa ....... .. aa ", +" .... aa .... .. .. aa ", +" ... aa ... aa .. aa ", +" ... aa .. aa .. aa ", +" .... aa .. aa .. aa ", +" .... aa .. aa .. aa ", +" .... aa .. aaa .. aa ", +" ... aa . a aaaa ... aa ", +" ... aa aaaaaaaa ... aa ", +" .... aa aaaaa ... aa ", +" ... aaaaaaaaaaaaaaaaa aa ... aa ", +" ... aaaaaaaaaaaaaaaaaaaaaaaaaaa ... aa ", +" ... aaaaaaaaa aaaaaaa aa .... aa ", +" ... aaaaaaa aaaaa aa .... aa ", +" ... aaaaaaa aaaaaa .. .... aa ", +" ... aaaaaa aaaaa .. ..... aa ", +" ... aaaaaa aaaa .. ...... aa ", +" ... aaaaa aa aaa ....... ........ aa ", +" ... aaaaa aa aaaa ............. aa ", +" ... aaaaa aa aaa aa .... aa ", +" ... aaaa aa aa aa aa ", +" ... aaaa aa aa aa ", +" ... aaaa aa aa aa ", +" .. aaa a . aa aa ", +" ... aaa .... aaaaa aa ", +" ... aaaa .... .. aaaaaaa aa ", +" .. aaaa ................ .. aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ", +" .. aaaa ........... ......... .... aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ", +" ... aaa ....... ...... ..... ", +" ... aaa ...... ..... ....... ", +" .. aaa ...... .... ................ .............. ", +" .. aaa ..... .. ...........................aa ", +" .. aaa ... .. .... aaaa ", +" .. aa ... .. aaaaa ", +" .. aa .... .. aaaaa ", +" .. aaa .... .. aaaaa ", +" ... aaa .... aaaaaa ", +" ... aa ... aaaaaaaaaaa .. aaaaaa ", +" .. aa ... aaaaaaaaaaaaaaaaa .. aaaaaaa ", +" .. aa ... aaaaaa aaaaa aaaaaaa ", +" .. aa .. aaaa aaaa aa .. aaaaaaaa ", +" .. aa .. aaaa aa aa .. aaaaaaa aaaaaaaaaa ", +" .. aa ... aaaa .. .. aaaaaaaaaaaaaa aaaaaaaaaa ", +" .. aa ... aaa .. aa .. aaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ", +" .. aa .. aa aa .. aaaa aaaaaaaaaaaaaaaaaaaaaaaaa ", +" .. aa .. aaa .. aa .. aaaa ", +" .. aa .. aaa .. aa .. aaa ", +" .. aa .. aa aa .. aa ", +" .. aa .. aa .. aa aa ", +" .. aa .. aa .. aa .. aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aa ", +" .. aa .. aa .. aa .. aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aa ", +" .. aa .. aa .. aa .. aa aaaaaaa aa ", +" .. aa .. aa .. aa .. aaa aaaaa aa ", +" .. aa .. aa .. aa .. aaa aa aa ", +" .. aa .. .. aa .. aa aa aa ", +" .. aa .. .. aa .. aa aa aa ", +" .. aa aa .. aa .. aa aa ", +" .. aa .. aa .. aa .. aa ", +" .. aa .. aa .. aa .. aa ", +" .. aa aaa ... aa .. aa ", +" .. aa aa aaaa ... aa .. aa .. ", +" .. aa aaaa aaaa .. aaa .. .. .. ", +" .. aaaaaaa ... aaa .. .. .. ", +" .. aaaa ... aa .. ..... .. .. ", +" .. aa ... aa .. ....... .. ..... ", +" .. aa ... aa ...... .. ..... ", +" ... aa .. .... .. .. ", +" .. .... aa . a .. .. ", +" .. .... aaa aa .. ", +" .. .... aaa aa .. aa ", +" .. .... aa aaaa aaa . aaa aaaaa ", +" .. .... aaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ", +" .. .. .... aaa aaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaa ", +" .... ..... aa ", +" .... ...... aaa ", +" .. ..... ....... aaa ", +" .. ......... .......... aaa ", +" .................... aaaa ", +" ......... aaa ", +" aaa ", +" aaaa ", +" aaa ", +" aaa ", +" aaaa ", +" aaaa ", +" aaaa ", +" aa aaaa ", +" aaaa aaaaa ", +" aaaa aaaaa ", +" aaaa aaaaa ", +" aaaa aaaaaa ", +" aa aaaaa ", +" aaaa aaaaaa ", +" aaaaaaa aaaaaaaaa ", +" aaaaaaaa aaaaaaaaaa ", +" aaaaaaaaaaaaaaaaaaaaaaaaaa ", +" aaaaaaaaaaaaaaaaa ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ................ ...... ....... ................. ", +" ........................ ........ ........ ........................ ...................................... ", +" ........ ....... .... .... ........ ...... .......................................... ", +" ...... ..... ... ... aa ....... .... ..... . a ", +" ..... .. ... aa .. aa ..... .. .... aa ", +" ..... .. aa .. aa .... .. .... aa ", +" ..... .. .. aa .. aa ..... .. .... aaa ", +" .... .. .. aa .. aa ..... .. .... aaa ", +" .... .. aa .. aa ... .. ... aaa ", +" .... aaaaaaaaaaa .. aa .. aa .... aaaaaaaaaaa aa ... aaaa ", +" ... aaaaaaaaaaaaaaaaa .. aa .. aa .... aaaaaaaaaaaaaaaaa aa ... aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ", +" ... aaaaaaa aaaaa aa .. aa .. aa ... aaaaaaa aaaaaa aa .. aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ", +" .... aaaaaa aaaa aa .. aa .. aa ... aaaaa aaa aa ... aaaa ", +" ... aaaaa aa aa .. aa .. aa ... aaaaa aa ... aaa ", +" .. aaa aa .. aa .. aa ... aaaa aa .. aa ", +" .. aaa aaa .. aa .. aa .. aaa aaa .. aa ", +" ... aaa .. aaaa .. aa .. aa .. aaa aaa .. aa ", +" ... aaa . a aaaaa .. aa .. aa ... aa aa aaaa .. aa ", +" .. aaa aaaaaaaa .. aa .. aa ... aa aaaaaaaa .. aa ", +" .. aa aaaa .. aa .. aa .. aa aaaa .. aa ", +" .. aa .. aa .. aa .. aa .. aa ", +" .. aa .. aa .. aa .. aa .. aa ", +" .. aa .. aa .. aa .. aa .. aa ", +" .. aa .. aa .. aa .. aa .. aa ", +" .. .. aa .. aa .. aa .. aa ", +" .. .. .. aa .. aa .. .. .. aa ", +" .. .... .. aa .. aa .. .... .. aa ", +" .. ..... .. aa .. aa .. ..... .. aa ", +" .. ....... .. aa .. aa .. ....... .. aa ", +" .. ......... .. aa .. aa .. .......... .. a .............................. ", +" .......... .. aa .. aa .......... .. ............................... ", +" ........ .. aa .. aa ........ .. ", +" ...... .. aa .. aa aa ...... .. aa ", +" ... .. aa .. aa aa .... .. aa ", +" aa .. .. aa .. aa .... .. aa ", +" aaaa .... .. aa .. aa aa .... .. aa ", +" aaaaa .. .. aa .. aa aaaaa .. .. aaa ", +" aaaaaa .. aa .. aa aaaaaaa .. aaaa ", +" aaaaaaa .. aa .. aa aaaaaaa .. aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ", +" aaaaaaaaa .. aa .. aa aaaaaaaaa aa .. aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ", +" aaaaaaaaaa aa .. aa .. aa aaaaaaaaaa aa .. aa ", +" aaaaaaaa aa .. aa .. aa aaaaaaa aa .. aa ", +" aaaaaa aa .. aa .. aa aaaaaa aa .. aa ", +" aaa aa .. aa .. aa aaa aa .. aa ", +" aa .. aa .. aa aa .. aa ", +" aa .. aa ... aaa aa .. aa ", +" .. aa .. aa ... aaa aa .. aa ", +" .. aa .. aa .. aa .. aa .. aa ", +" .. aa .. aa .. aa .. aa .. aa ", +" .... .. aa .. aa ... aa .... .. aa .. aa ", +" ........ .. aa .. aa ... aa ........ .. aa .. aa ", +" ..... .. ... aa .. aa ... aaa .... .. .. aa .. aa ", +" ... ... aaa .. aa ... aaa ... ... aa .. aa ", +" ... ... aaa .. aa ... aa ... ... aa .. aa ", +" ... ... aa .. a . .... aaa .. ... aaa .. aa ", +" .. .. .... aa .. .. .... aaa .. .. .... aaa .. aa ", +" .. .... ..... aaa .. .. ..... aaa .. .... ..... aaa .. ", +" .. ...... ....... aaaa .. ..... ....... aaa .. ...... ........ aaa .. .................................. ", +" .. ..................... aaa ................. aaa .. ..................... aaa .. .................................. ", +" ............. aaa ........... aaaa .. ............. aaaa .. ", +" aa aaaa aaaa aa aaaa .. aa ", +" aa aaaa aaaa aa aaaa .. aa ", +" aaaaa aaaaa aa aaaaa .. aa ", +" aa aaaaa aaaaa aa aaaaa aa ", +" aaaa aaaaa aa aaaa aa aaaaa aa aa ", +" aaaa aaaaaa aaaa aaaaaa aaaaa aaaaaa aaaa aaa ", +" aaaaaa aaaaaaaa aaaaaa aaaaaaaa aaaaaaa aaaaaaaa aaaaaa aaaaaa ", +" aaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ", +" aaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ", +" ", +" ", +" ", +" " +}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdmbgrd-0.6/backgrd.c new/xdmbgrd-0.7/backgrd.c --- old/xdmbgrd-0.6/backgrd.c 2004-03-11 13:56:40.000000000 +0100 +++ new/xdmbgrd-0.7/backgrd.c 2022-02-08 15:27:55.723592422 +0100 @@ -1,11 +1,13 @@ /* * Copyright (c) 1997-2000 SuSE GmbH Nuernberg - * Version 0.4 + * Copyright (c) 2022 SUSE Software Solutions Germany GmbH + * Version 0.7 * Author: Werner Fink, <[email protected]> */ static const char unused[] __attribute__ ((unused)) = "\n" "\000***********************************************\n" -"\000* Copyright (c) 1997-2000 SuSE GmbH Nuernberg *\n" +"\000* Copyright (c) 1997-2022 SuSE GmbH Nuernberg *\n" +"\000* Copyright (c) 2022 SUSE Software Solutions Germany GmbH *\n" "\000* Author: Werner Fink, <[email protected]> *\n" "\000***********************************************\n"; @@ -37,6 +39,7 @@ int main () { Display *dpy; + FILE * release = fopen("/etc/os-release", "r"); char *display_name = getenv("DISPLAY"); u_int out_len; char *output; @@ -48,7 +51,22 @@ exit(-1); } - get_pick(SuSE_Linux_data, SuSE_Linux_len, &output, &out_len); + if (!release) + get_pick(SLES_data, SLES_len, &output, &out_len); + else { + char buf[128]; + char *ptr; + fgets(buf, sizeof(buf)-1, release); + fclose(release); + if ((ptr = strchr(buf, '"'))) + ptr++; + else + ptr = &buf[0]; + if (strncasecmp(ptr, "opensuse", 8) == 0) + get_pick(openSuSE_data, openSuSE_len, &output, &out_len); + else + get_pick(SLES_data, SLES_len, &output, &out_len); + } setbackgrd(dpy, _PROGRAM, output); free(output); @@ -196,7 +214,7 @@ outhere: if (backshp) XFreePixmap(dpy, backshp); if (backxpm) XFreePixmap(dpy, backxpm); - if (&backattr) XpmFreeAttributes(&backattr); + XpmFreeAttributes(&backattr); XFlush(dpy); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdmbgrd-0.6/piggyback new/xdmbgrd-0.7/piggyback --- old/xdmbgrd-0.6/piggyback 2004-03-11 13:56:09.000000000 +0100 +++ new/xdmbgrd-0.7/piggyback 2022-02-08 11:31:09.827773872 +0100 @@ -4,12 +4,41 @@ echo "Need file for encapsulation in object file" 1>&2 exit 1 } + +opt=;arg= +while test "${1::1}" = "-" ; do + if test ${#1} -gt 2 -o "${2::1}" = "-" ; then + opt="$1" ; shift + else + opt="$1$2"; shift 2 + fi + arg="${opt:2}" + opt="${opt:1:1}" + arg="${arg%% }" + case "$opt" in + n) name="$arg" ;; + h) head="$arg" ;; + esac +done + fname=$1 shift args="$@" -tmpfile=$$piggy.gz -tmplink=$$piggy.lnk +if test -z "$name" ; then + name=${fname%%.*} + name=${name%_*} +fi +echo $head +if test -z "$file" ; then + file=${name}.o +fi +if test -z "$head" ; then + head=${file%%.o}.h +fi + +tmpfile=${fname}piggy.gz +tmplink=${fname}piggy.lnk trap "rm -rf $tmpfile $tmplink" 0 1 2 3 5 9 10 13 15 arch=$(uname -m) @@ -18,6 +47,10 @@ ld_m=elf64alpha ld_b=elf64-alpha ;; + parisc) + ld_m=hppalinux + ld_b=elf32-hppa-linux + ;; ppc) ld_m=elf32ppc ld_b=elf32-powerpc @@ -57,10 +90,6 @@ ld_m=${1} ;; esac -name=${fname%%.*} -name=${name%_*} -file=${name}.o -head=${name}.h gzip -9 -f -n -q < $fname > $tmpfile @@ -68,17 +97,22 @@ encaps -t $ld_b ${file} $tmpfile ${name}_data ${name}_len else echo \ - "SECTIONS { .data : \ + "SECTIONS { .data : ALIGN(8) \ { \ ${name}_len = .; \ LONG(${name}_data_end - ${name}_data) ${name}_data = .; \ *(.data) ${name}_data_end = .; \ } \ } " > $tmplink - ld -no-warn-mismatch -m $ld_m -r -o ${file} -b binary $tmpfile -b $ld_b -T $tmplink + ld -no-warn-mismatch -m $ld_m -r -o ${file} ${obj} -b binary $tmpfile -b $ld_b -T $tmplink fi -echo "/* Description of encapsulated file $fname */" > ${head} +echo $head +if ! test -s "${head}" ; then + echo "/* Description of encapsulated file $fname */" > ${head} +else + echo "/* Description of encapsulated file $fname */" >> ${head} +fi echo "extern char ${name}_data[];" >> ${head} echo "extern int ${name}_len;" >> ${head}
