jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

hal: cleanup package

Browse Source 
Closes #1525

Kconfig selects are not recursive, so ensure we select the dependencies
of our dependencies as well.

Cleanup target installation:
- Remove tasks handled by the generic post-build cleanup
- Hal doesn't install etc/rc.d, so don't try to delete it

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-05-04 23:11:20 +02:00
parent 32ed970075
commit 79db1ff5ac
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -2,12 +2,13 @@
Fixes all over the tree. Fixes all over the tree.
Updated/fixed packages: mplayer, xdriver_xf86-video-openchrome, Updated/fixed packages: hal, mplayer,
usb_modeswitch xdriver_xf86-video-openchrome, usb_modeswitch
Issues resolved (http://bugs.uclibc.org): Issues resolved (http://bugs.uclibc.org):
#985: Bump usb_modeswitch package to 1.1.0 #985: Bump usb_modeswitch package to 1.1.0
#1525: Package hal deletes a whole <target>/etc/rc.d directory
2010.05-rc1, Released May 3rd, 2010: 2010.05-rc1, Released May 3rd, 2010:

6
package/hal/Config.in
View File

@ -1,6 +1,12 @@
config BR2_PACKAGE_HAL config BR2_PACKAGE_HAL
bool "hal" bool "hal"
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT
select BR2_PACKAGE_LIBINTL
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS
select BR2_PACKAGE_DBUS_EXPAT
select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_DBUS_GLIB
select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA
select BR2_PACKAGE_UDEV select BR2_PACKAGE_UDEV

8
package/hal/hal.mk
View File

@ -63,19 +63,12 @@ $(HAL_DIR)/hald/hald: $(HAL_DIR)/.configured
$(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
$(MAKE) STAGING_DIR="$(STAGING_DIR)" DESTDIR="$(TARGET_DIR)" -C $(HAL_DIR) install $(MAKE) STAGING_DIR="$(STAGING_DIR)" DESTDIR="$(TARGET_DIR)" -C $(HAL_DIR) install
rm -rf $(TARGET_DIR)/usr/share/locale
rm -rf $(TARGET_DIR)/usr/share/doc
rm -rf $(TARGET_DIR)/usr/share/gtk-doc rm -rf $(TARGET_DIR)/usr/share/gtk-doc
rm -rf $(TARGET_DIR)/usr/share/hal/device-manager rm -rf $(TARGET_DIR)/usr/share/hal/device-manager
rm -rf $(TARGET_DIR)/usr/lib/pkgconfig
# remove _everything_ in $(TARGET_DIR)/usr/include?
# rm -rf $(TARGET_DIR)/usr/include
rm -rf $(TARGET_DIR)/usr/lib/libhal*.so rm -rf $(TARGET_DIR)/usr/lib/libhal*.so
rm -rf $(TARGET_DIR)/usr/lib/libhal*.la
rm -rf $(TARGET_DIR)/usr/lib/hal rm -rf $(TARGET_DIR)/usr/lib/hal
rm -rf $(TARGET_DIR)/etc/PolicyKit rm -rf $(TARGET_DIR)/etc/PolicyKit
$(INSTALL) -m 0755 -D package/hal/S98haldaemon $(TARGET_DIR)/etc/init.d $(INSTALL) -m 0755 -D package/hal/S98haldaemon $(TARGET_DIR)/etc/init.d
rm -rf $(TARGET_DIR)/etc/rc.d
for file in hald-addon-acpi* hald-addon-cpufreq \ for file in hald-addon-acpi* hald-addon-cpufreq \
hald-addon-keyboard hald-addon-pmu \ hald-addon-keyboard hald-addon-pmu \
hald-probe-pc-floppy hald-probe-printer \ hald-probe-pc-floppy hald-probe-printer \
@ -86,7 +79,6 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
do \ do \
rm -f $(TARGET_DIR)/usr/libexec/$$file; \ rm -f $(TARGET_DIR)/usr/libexec/$$file; \
done done
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal*
hal: host-pkg-config dbus-glib hwdata udev $(TARGET_DIR)/$(HAL_TARGET_BINARY) hal: host-pkg-config dbus-glib hwdata udev $(TARGET_DIR)/$(HAL_TARGET_BINARY)