From c13e29bc614e49ad4ebf6db951a6546c7ff46c53 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 14 Sep 2016 16:38:32 +0200 Subject: [PATCH] wakeonlan: Remove `perllocal.pod` from package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix bee’s conflict warning below, by removing the file `perllocal.pod` from the package. Normally, Perl modules append their section there, when installed. ``` [BEE] changing to image directory: /dev/shm/bee-root/wakeonlan/wakeonlan-0.41-0/image [BEE] -> creating package wakeonlan-0.41-0.x86_64.bee.tar.bz2 .. [BEE] /src/mariux/beeroot/packages/wakeonlan-0.41-0.x86_64.bee.tar.bz2 -rw-r--r-- root/system 2098 2016-09-14 15:40 CONTENT -rwxr-xr-x root/system 2631 2016-09-14 15:40 BUILD -rw-r--r-- root/system 439 2016-09-14 15:40 META -r--r--r-- root/system 4588 2016-09-14 15:40 /usr/local/share/man/man1/wakeonlan.1 -r-xr-xr-x root/system 5237 2016-09-14 15:40 /usr/local/bin/wakeonlan drwxr-xr-x root/system 0 2016-09-14 15:40 /usr/local/lib/perl5/ drwxr-xr-x root/system 0 2016-09-14 15:40 /usr/local/lib/perl5/site_perl/ drwxr-xr-x root/system 0 2016-09-14 15:40 /usr/local/lib/perl5/site_perl/5.12.1/ drwxr-xr-x root/system 0 2016-09-14 15:40 /usr/local/lib/perl5/site_perl/5.12.1/x86_64-linux-thread-multi/ drwxr-xr-x root/system 0 2016-09-14 15:40 /usr/local/lib/perl5/site_perl/5.12.1/x86_64-linux-thread-multi/auto/ drwxr-xr-x root/system 0 2016-09-14 15:40 /usr/local/lib/perl5/site_perl/5.12.1/x86_64-linux-thread-multi/auto/wakeonlan/ -rw-r--r-- root/system 163 2016-09-14 15:40 /usr/local/lib/perl5/site_perl/5.12.1/x86_64-linux-thread-multi/auto/wakeonlan/.packlist drwxr-xr-x root/system 0 2016-09-14 15:40 /usr/local/lib/perl5/5.12.1/ drwxr-xr-x root/system 0 2016-09-14 15:40 /usr/local/lib/perl5/5.12.1/x86_64-linux-thread-multi/ -rw-r--r-- root/system 242 2016-09-14 15:40 /usr/local/lib/perl5/5.12.1/x86_64-linux-thread-multi/perllocal.pod [BEE] -> saving bee-file wakeonlan.be0 .. [BEE] /src/mariux/beeroot/bee-files/wakeonlan-0.41-0.bee ‘/home/pmenzel/bee-files/./wakeonlan.be0’ -> ‘/src/mariux/beeroot/bee-files/wakeonlan-0.41-0.bee’ [BEE] Conflicts with installed package found: Donald-1.03-0.x86_64: [BEE] /usr/local/lib/perl5/5.12.1/x86_64-linux-thread-multi/perllocal.pod [BEE] Conflicts with installed package found: IO-Tty-1.10-0.x86_64: [BEE] /usr/local/lib/perl5/5.12.1/x86_64-linux-thread-multi/perllocal.pod [BEE] Conflicts with installed package found: Linux-Inotify2-1.22-0.x86_64: [BEE] /usr/local/lib/perl5/5.12.1/x86_64-linux-thread-multi/perllocal.pod [BEE] Conflicts with installed package found: Mojolicious-2.36-0.x86_64: [BEE] /usr/local/lib/perl5/5.12.1/x86_64-linux-thread-multi/perllocal.pod [BEE] Conflicts with installed package found: Term-ReadLine-Gnu-1.20-0.x86_64: [BEE] /usr/local/lib/perl5/5.12.1/x86_64-linux-thread-multi/perllocal.pod [BEE] Conflicts with installed package found: Time-Period-1.24-0.x86_64: [BEE] /usr/local/lib/perl5/5.12.1/x86_64-linux-thread-multi/perllocal.pod [BEE] Conflicts with installed package found: Tk-804.029-0.x86_64: [BEE] /usr/local/lib/perl5/5.12.1/x86_64-linux-thread-multi/perllocal.pod [BEE] Conflicts with installed package found: subversion-1.6.16-1.x86_64: [BEE] /usr/local/lib/perl5/5.12.1/x86_64-linux-thread-multi/perllocal.pod ``` --- wakeonlan.be0 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wakeonlan.be0 b/wakeonlan.be0 index f963540d0..2c0b935b9 100755 --- a/wakeonlan.be0 +++ b/wakeonlan.be0 @@ -66,6 +66,10 @@ SRCURL[0]="http://http.debian.net/debian/pool/main/w/wakeonlan/wakeonlan_${PKGVE #} ## by default this may be 'make install DESTDIR="${D}"' +mee_install_post() { + rm -r ${D}${PREFIX}/local/lib/perl5/5.12.1 +} + ############################################################################### ## ## Additional hints: