diff options
59 files changed, 1390 insertions, 368 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aa45d739e9..7375ac5f50 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -167,16 +167,17 @@ Website: http://zerochaos.aircrack-ng.org Interests: wifi, packet injection, security Distros: Angstrom Machines: akita -Recipes: aircrack-ng, kismet, mdk2, rfakeap, rglueap, void11 +Recipes: aircrack-ng, kismet, lorcon, mdk, rfakeap, rglueap, +Recipes: rt2570-k2wrlz, void11 Person: Rolf 'Laibsch' Leggewie Mail: OE-recipes@rolf.leggewie.biz Website: http://oz.leggewie.org Interests: Japanese on the Zaurus -Distros: openzaurus -Machines: collie +Distros: Ångström +Machines: collie, spitz Recipes: anthy, nunome, uim*, granule, qpobox*, qte-font-unifont* -Recipes: qpf-unismall, poboxserver, imkit* +Recipes: qpf-unismall, qpobox, poboxserver, imkit*, scim, zten Person: Shane Volpe Mail: shanevolpe@gmail.com diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 5fadee4ab6..446e78ae1a 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -253,10 +253,11 @@ def icc_path(bb,d,compile): #"system" package blacklist contains a list of packages that can not distribute compile tasks #for one reason or the other - system_package_blacklist = [ "uclibc", "glibc", "qemu" ] + system_package_blacklist = [ "uclibc", "glibc-intermediate", "qemu" ] for black in system_package_blacklist: if black in package_tmp: + bb.data.setVar('PARALLEL_MAKE' , '', d) return "" #user defined exclusion list @@ -265,6 +266,7 @@ def icc_path(bb,d,compile): for black in user_package_blacklist: if black in package_tmp: + bb.data.setVar('PARALLEL_MAKE' , '', d) return "" diff --git a/conf/checksums.ini b/conf/checksums.ini index 953b5a14ea..dba0f2839d 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -854,9 +854,9 @@ sha256=2d7af8211cda81abde3e0bb8ccedbd18924a27b244ff35d4eacafcf899038c56 md5=183f6d46e8fa5e4b2aff240ab1586c2e sha256=80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463 -[ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.9.2.tar.gz] -md5=6bc300365053c815b10b800a21e0bc7e -sha256=fdb726c5d3761d4c1569e702b74cf9561dc07c6a5f48af3e3fd18685f50d490c +[ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz] +md5=b77a17e4a5a817100ad4b2613935055e +sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b [ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz] md5=db4e6939fafbaae80cab11a67f28771d diff --git a/conf/distro/hentges-2.0.conf b/conf/distro/hentges-2.0.conf new file mode 100644 index 0000000000..5f23949d2d --- /dev/null +++ b/conf/distro/hentges-2.0.conf @@ -0,0 +1,42 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2007 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: hentges-2.0.conf +# Date: 20070521 (YMD) + +DESCRIPTION = "Distribution configuration for the Hentges ROM based on Angstrom" +MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" +HOMEPAGE = "http://www.hentges.net" +LICENSE = "MIT" + +###################################################################################### + +require conf/distro/angstrom-2007.1.conf + +###################################################################################### + +require conf/machine/hentges-2.0_common.conf +require conf/machine/hentges-2.0_${MACHINE}.conf + +###################################################################################### + +DISTRO_VERSION = "1.9+WIP-${DATE}" +DISTRO_REVISION = "1" + +DISTRO = "hentges-2.0" +DISTRO_NAME = "Hentges" + +###################################################################################### + +# Override FEED_URIS here + +###################################################################################### + +HENTGES_PV = "${DISTRO_VERSION}" +HENTGES_PR = "${DISTRO_REVISION}" + +###################################################################################### + diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 980c158181..564a2d0cfb 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -14,3 +14,8 @@ ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" require conf/distro/include/slugos.inc + +# glibc: +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc ?= "glibc" diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 11dbadacb8..1996a1603b 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -7,6 +7,7 @@ TARGET_ARCH = "i686" PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +PREFERRED_PROVIDER_xserver = "xserver-xorg" udevdir = "/dev" diff --git a/conf/machine/hentges-2.0_common.conf b/conf/machine/hentges-2.0_common.conf new file mode 100644 index 0000000000..e7e1d5b2b7 --- /dev/null +++ b/conf/machine/hentges-2.0_common.conf @@ -0,0 +1,40 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2007 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: hentges-2.0_common.conf +# Date: 20070521 (YMD) + +DESCRIPTION = "Hentges common dependency description" +MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" +LICENSE = "MIT" + +###################################################################################### + +HENTGES_BASE_DEPENDS = "task-base-wifi" +HENTGES_BASE_RDEPENDS = "task-base-wifi" + +###################################################################################### + +# Handled via task-base: + +DISTRO_SSH_DAEMON ?= "dropbear" + +###################################################################################### + +# Handled via task-base: + +DISTRO_EXTRA_RDEPENDS = "\ + update-modules \ + ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ + angstrom-version \ + ipkg ipkg-collateral \ + util-linux-mount util-linux-umount \ + ${EXTRA_STUFF} \ + ${DEBUG_APPS} \ + " + +HENTGES_X11_DEPENDS += "angstrom-x11-base-depends \ + angstrom-gpe-task-base" diff --git a/conf/machine/hentges-2.0_spitz.conf b/conf/machine/hentges-2.0_spitz.conf new file mode 100644 index 0000000000..cffa01de92 --- /dev/null +++ b/conf/machine/hentges-2.0_spitz.conf @@ -0,0 +1,39 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2007 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: hentges-2.0_spitz.conf +# Date: 20070521 (YMD) + +DESCRIPTION = "Hentges dependency description for Spitz aka SL-C3x00" +MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" +HOMEPAGE = "<homepage>" +LICENSE = "MIT" + +###################################################################################### + +DISTRO_SSH_DAEMON_spitz = "openssh" + +XSERVER = "xserver-kdrive-fbdev" + +###################################################################################### + +HENTGES_BASE_RDEPENDS += "tar bash" + +###################################################################################### + +# In the future I plan to replace the angstrom-*task* stuff with custom +# hentges tasks, replacing the angstrom defaults where needed + +HENTGES_X11_RDEPENDS += "${XSERVER} \ + angstrom-gpe-task-pim \ + angstrom-ohand-task-pim \ + angstrom-gpe-task-settings \ + angstrom-gpe-task-apps \ + angstrom-gpe-task-games \ + angstrom-task-office \ + angstrom-task-printing \ + angstrom-task-sectest \ + firefox gftp" diff --git a/packages/alsa/alsa-utils_1.0.13.bb b/packages/alsa/alsa-utils_1.0.13.bb index 93054a3ab6..e1ae7aa399 100644 --- a/packages/alsa/alsa-utils_1.0.13.bb +++ b/packages/alsa/alsa-utils_1.0.13.bb @@ -3,10 +3,17 @@ HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" +# lazy hack. needs proper fixing in gettext.m4, see +# http://bugs.openembedded.org/show_bug.cgi?id=2348 +# please close bug and remove this comment when properly fixed +# +EXTRA_OECONF_linux-uclibc = "--disable-nls" +EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls" + inherit autotools # This are all packages that we need to make. Also, the now empty alsa-utils diff --git a/packages/bluez/bluez-libs_3.11.bb b/packages/bluez/bluez-libs_3.11.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.11.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-utils_3.10.1.bb b/packages/bluez/bluez-utils_3.11.bb index 44827dc2d0..6ac6c8f977 100644 --- a/packages/bluez/bluez-utils_3.10.1.bb +++ b/packages/bluez/bluez-utils_3.11.bb @@ -8,7 +8,7 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ file://02dtl1_cs.sh \ " -PR = "r3" +PR = "r0" EXTRA_OECONF = " \ --enable-bccmd \ diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb index 2c0f2c67d9..3650b927da 100644 --- a/packages/gdb/gdb_6.6.bb +++ b/packages/gdb/gdb_6.6.bb @@ -1,6 +1,7 @@ require gdb.inc -PR = "r1" +PR = "r2" -#only append it for glib, not for uclibcc +#only append it for glib, not for uclibc RRECOMMENDS_gdb_append_linux = " glibc-thread-db " +RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " diff --git a/packages/gtk+/composite-pixbuf_0.0.bb b/packages/gtk+/composite-pixbuf_0.0.bb new file mode 100644 index 0000000000..729343fb44 --- /dev/null +++ b/packages/gtk+/composite-pixbuf_0.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Pixbuf performance test" +LICENSE = "Public domain" +DEPENDS = "gtk+" + +SRC_URI = "http://amelang.net/composite_pixbuf.c" + +S = "${WORKDIR}" + +do_compile() { + ${CC} ${CFLAGS} composite_pixbuf.c -o composite_pixbuf \ + `pkg-config --cflags gdk-2.0` `pkg-config --libs gdk-2.0` `pkg-config --libs x11` `pkg-config --libs pango` \ + -lxcb -lXext -lXinerama -lXrandr -lXcursor -lXfixes -lpangoft2-1.0 -lz -lexpat -lxcb-xlib -lXau -lXdmcp +} + +do_install() { + install -d ${D}${bindir} + install -m 755 composite_pixbuf ${D}${bindir} +} diff --git a/packages/images/hentges-console-image.bb b/packages/images/hentges-console-image.bb new file mode 100644 index 0000000000..24235b2887 --- /dev/null +++ b/packages/images/hentges-console-image.bb @@ -0,0 +1,38 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2007 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: hentges-console-image.bb +# Date: 20070516 (YMD) + +DESCRIPTION = "Hentges Console Image" +MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +PV = "${HENTGES_PV}" +PR = "${HENTGES_PR}" + +###################################################################################### + +export IMAGE_NAME = "hentges-console-image" +export IMAGE_LINGUAS = "" +export PACKAGE_INSTALL = "${RDEPENDS}" + +###################################################################################### + +DEPENDS = "task-base \ + task-hentges-base" + +RDEPENDS = "task-base \ + task-hentges-base" + +###################################################################################### + +inherit image + + diff --git a/packages/images/hentges-x11-image.bb b/packages/images/hentges-x11-image.bb new file mode 100644 index 0000000000..84a4fec94f --- /dev/null +++ b/packages/images/hentges-x11-image.bb @@ -0,0 +1,48 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2007 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: hentges-x11-image.bb +# Date: 20070522 (YMD) + +DESCRIPTION = "Hentges X11 Image" +MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "MIT" + +###################################################################################### + +PV = "${HENTGES_PV}" +PR = "${HENTGES_PR}" + +###################################################################################### + +export IMAGE_NAME = "hentges-x11-image" +export IMAGE_LINGUAS = "" +export PACKAGE_INSTALL = "${RDEPENDS}" + +###################################################################################### + +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" + +###################################################################################### + +DEPENDS = "task-base \ + task-hentges-base \ + task-hentges-x11" + +RDEPENDS = "task-base \ + task-hentges-base \ + task-hentges-x11" + +###################################################################################### + +inherit image + + diff --git a/packages/kismet/kismet-2006-04-R1/no-chmod.patch b/packages/kismet/kismet-2006-04-R1/no-chmod.patch deleted file mode 100644 index b22c513b68..0000000000 --- a/packages/kismet/kismet-2006-04-R1/no-chmod.patch +++ /dev/null @@ -1,173 +0,0 @@ ---- kismet-2006-04-R1/Makefile.in.orig 2006-09-14 11:37:20.000000000 +0100 -+++ kismet-2006-04-R1/Makefile.in 2006-09-14 11:38:01.000000000 +0100 -@@ -130,52 +130,52 @@ - fi - - binuserinstall: -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE); -+ install -m 755 $(PS) $(BIN)/$(PS); -+ install -m 755 $(DRONE) $(BIN)/$(DRONE); - - binsuidinstall: -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE); -+ install -m 4755 $(PS) $(BIN)/$(PS); -+ install -m 4755 $(DRONE) $(BIN)/$(DRONE); - - commoninstall: - mkdir -p $(ETC) - mkdir -p $(BIN) - -- install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet $(BIN)/kismet -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC) -- # install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER) -+ install -m 755 scripts/kismet $(BIN)/kismet -+ install -m 755 $(NC) $(BIN)/$(NC) -+ # install -m 755 $(HOPPER) $(BIN)/$(HOPPER) - @if test "$(ZAURUS)" = "yes"; then \ -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \ -- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \ -+ install -m 755 $(BUZZER) $(BIN)/buzzme; \ -+ echo install -m 755 $(BUZZER) $(BIN)/buzzme; \ - fi --#install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor --#install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor -+#install -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor -+#install -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor - mkdir -p $(MAN)/man1 -- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1 -- # install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_monitor.1 $(MAN)/man1/kismet_monitor.1 -- # install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_hopper.1 $(MAN)/man1/kismet_hopper.1 -- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1 -+ install -m 644 man/kismet.1 $(MAN)/man1/kismet.1 -+ # install -m 644 man/kismet_monitor.1 $(MAN)/man1/kismet_monitor.1 -+ # install -m 644 man/kismet_hopper.1 $(MAN)/man1/kismet_hopper.1 -+ install -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1 - mkdir -p $(MAN)/man5 -- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5 -- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5 -- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5 -+ install -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5 -+ install -m 644 man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5 -+ install -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5 - - @if test "$(GPSLBUILD)" = "$(GPSL)"; then \ -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \ -- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \ -- install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ -- echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ -- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ -- echo install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ -+ install -m 755 $(GPSL) $(BIN)/$(GPSL); \ -+ echo install -m 755 $(GPSL) $(BIN)/$(GPSL); \ -+ install -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ -+ echo install -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ -+ install -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ -+ echo install -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ - fi - - mkdir -p $(WAV) -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/new_network.wav $(WAV)/new_network.wav -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/traffic.wav $(WAV)/traffic.wav -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/junk_traffic.wav $(WAV)/junk_traffic.wav -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/alert.wav $(WAV)/alert.wav -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/ap_manuf $(ETC)/ap_manuf; -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/client_manuf $(ETC)/client_manuf; -+ install -m 644 wav/new_network.wav $(WAV)/new_network.wav -+ install -m 644 wav/traffic.wav $(WAV)/traffic.wav -+ install -m 644 wav/junk_traffic.wav $(WAV)/junk_traffic.wav -+ install -m 644 wav/alert.wav $(WAV)/alert.wav -+ install -m 644 conf/ap_manuf $(ETC)/ap_manuf; -+ install -m 644 conf/client_manuf $(ETC)/client_manuf; - - @if test -f $(BIN)/kismet_curses; then \ - echo "Removing old kismet_curses binary. The panels frontend is now kismet_client."; \ -@@ -188,22 +188,22 @@ - @if test -f $(ETC)/kismet.conf; then \ - $(MAKE) -e checkconfig; \ - else \ -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ -- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ -+ install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ -+ echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ - echo "Installed config into $(ETC)/kismet.conf."; \ - fi - @if test -f $(ETC)/kismet_drone.conf; then \ - $(MAKE) -e checkdroneconfig; \ - else \ -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ -- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ -+ install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ -+ echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf; \ - echo "Installed drone config into $(ETC)/kismet_drone.conf."; \ - fi - @if test -f $(ETC)/kismet_ui.conf; then \ - $(MAKE) -e checkuiconfig; \ - else \ -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ -- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ -+ install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ -+ echo install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ - echo "Installed UI config into $(ETC)/kismet_ui.conf."; \ - fi - @echo "Installed kismet into $(BIN)/." -@@ -221,22 +221,22 @@ - @if test -f $(ETC)/kismet.conf; then \ - $(MAKE) -e checkconfig; \ - else \ -- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ -- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ -+ install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ -+ echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ - echo "Installed config into $(ETC)/kismet.conf."; \ |