diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash index af6458b15d..ff3ffc271e 100644 --- a/repos/dde_linux/ports/dde_linux.hash +++ b/repos/dde_linux/ports/dde_linux.hash @@ -1 +1 @@ -366d27b8a692809bd91945127c12dfb5e3502980 +477b1b59ec591bd7ef01c853f15df4acabca6624 diff --git a/repos/dde_linux/ports/dde_linux.port b/repos/dde_linux/ports/dde_linux.port index 9ad1735d03..684718df7e 100644 --- a/repos/dde_linux/ports/dde_linux.port +++ b/repos/dde_linux/ports/dde_linux.port @@ -123,7 +123,6 @@ URL(libnl) := https://github.com/thom311/libnl/releases/download/libnl3_2_25/lib SHA(libnl) := 8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5 DIR(libnl) := src/lib/libnl - # # wpa_supplicant sources # @@ -131,14 +130,6 @@ URL(wpa_supplicant) := git://w1.fi/srv/git/hostap.git REV(wpa_supplicant) := 25bd4e7beb582509596fe60cb3591e1299f3121b DIR(wpa_supplicant) := src/app/wpa_supplicant -# remove unused code and git history from the repo -_patch: cleanup-wpa -cleanup-wpa: - @for dir in doc eap_example hs20 mac80211_hwsim radius_example \ - hostapd tests wlantest wpadebug wpaspy; do \ - rm -rf ${DIR(wpa_supplicant)}/$$dir; done - - # # Firmware images # diff --git a/repos/dde_linux/recipes/src/wifi_drv/content.mk b/repos/dde_linux/recipes/src/wifi_drv/content.mk index f099a960b5..4221eec416 100644 --- a/repos/dde_linux/recipes/src/wifi_drv/content.mk +++ b/repos/dde_linux/recipes/src/wifi_drv/content.mk @@ -23,7 +23,7 @@ MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find src/lib/libnl -type f) \ $(shell cd $(PORT_DIR); find src/app/wpa_supplicant -type f) MIRROR_FROM_PORT_DIR := $(filter-out $(MIRROR_FROM_REP_DIR),$(MIRROR_FROM_PORT_DIR)) -content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR) +content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR) cleanup-wpa $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) @@ -32,6 +32,11 @@ $(MIRROR_FROM_PORT_DIR): mkdir -p $(dir $@) cp -r $(PORT_DIR)/$@ $@ +cleanup-wpa: $(MIRROR_FROM_PORT_DIR) + @for dir in .git doc eap_example hs20 mac80211_hwsim radius_example \ + hostapd tests wlantest wpadebug wpaspy; do \ + rm -rf src/app/wpa_supplicant/$$dir; done + content: LICENSE LICENSE: ( echo "Linux is subject to GNU General Public License version 2, see:"; \