Skip to content

Commit

Permalink
solved conflicts with c413521
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucaderi @cardigliano
lucaderi authored and cardigliano committed Jul 8, 2015
1 parent 6c41a6e commit 1cc0f89
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 1 deletion.
3 changes: 3 additions & 0 deletions drivers/DNA/Makefile.dkms.e1000e.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ add_deb:

remove:
-dkms remove -m @E1000E@-dna -v @E1000E_VERSION@.@REVISION@ --all
\/bin/rm -f /lib/modules/*/weak-updates/e1000e*ko
\/bin/rm -f /lib/modules/*/extra/e1000e*ko
\/bin/rm -rf /var/lib/dkms/e1000e-dna

veryclean: remove
\/bin/rm -fr /usr/src/@E1000E@-dna-@E1000E_VERSION@.@REVISION@
Expand Down
3 changes: 3 additions & 0 deletions drivers/DNA/Makefile.dkms.igb.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ add_deb:

remove:
-dkms remove -m @IGB@-dna -v @IGB_VERSION@.@REVISION@ --all
\/bin/rm -f /lib/modules/*/weak-updates/igb*ko
\/bin/rm -f /lib/modules/*/extra/igb*ko
\/bin/rm -rf /var/lib/dkms/igb-dna

veryclean: remove
\/bin/rm -fr /usr/src/@IGB@-dna-@IGB_VERSION@.@REVISION@
Expand Down
3 changes: 3 additions & 0 deletions drivers/DNA/Makefile.dkms.ixgbe.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ add_deb:

remove:
-dkms remove -m @IXGBE@-dna -v @IXGBE_VERSION@.@REVISION@ --all
\/bin/rm -f /lib/modules/*/weak-updates/ixgbe*ko
\/bin/rm -f /lib/modules/*/extra/ixgbe*ko
\/bin/rm -rf /var/lib/dkms/ixgbe-dna

veryclean: remove
\/bin/rm -fr /usr/src/@IXGBE@-dna-@IXGBE_VERSION@.@REVISION@
Expand Down
3 changes: 3 additions & 0 deletions drivers/ZC/intel/Makefile.dkms.e1000e.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ add_deb:

remove:
-dkms remove -m @E1000E@-zc -v @E1000E_VERSION@.@REVISION@ --all
\/bin/rm -f /lib/modules/*/weak-updates/e1000e*ko
\/bin/rm -f /lib/modules/*/extra/e1000e*ko
\/bin/rm -rf /var/lib/dkms/e1000e-zc

veryclean: remove
\/bin/rm -fr /usr/src/@E1000E@-zc-@E1000E_VERSION@.@REVISION@
Expand Down
3 changes: 3 additions & 0 deletions drivers/ZC/intel/Makefile.dkms.i40e.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ add_deb:

remove:
-dkms remove -m @I40E@-zc -v @I40E_VERSION@.@REVISION@ --all
\/bin/rm -f /lib/modules/*/weak-updates/i40e*ko
\/bin/rm -f /lib/modules/*/extra/i40e*ko
\/bin/rm -rf /var/lib/dkms/i40e-zc

veryclean: remove
\/bin/rm -fr /usr/src/@I40E@-zc-@I40E_VERSION@.@REVISION@
Expand Down
3 changes: 3 additions & 0 deletions drivers/ZC/intel/Makefile.dkms.igb.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ add_deb:

remove:
-dkms remove -m @IGB@-zc -v @IGB_VERSION@.@REVISION@ --all
\/bin/rm -f /lib/modules/*/weak-updates/igb*ko
\/bin/rm -f /lib/modules/*/extra/igb*ko
\/bin/rm -rf /var/lib/dkms/igb-zc

veryclean: remove
\/bin/rm -fr /usr/src/@IGB@-zc-@IGB_VERSION@.@REVISION@
Expand Down
3 changes: 3 additions & 0 deletions drivers/ZC/intel/Makefile.dkms.ixgbe.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ add_deb:

remove:
-dkms remove -m @IXGBE@-zc -v @IXGBE_VERSION@.@REVISION@ --all
\/bin/rm -f /lib/modules/*/weak-updates/ixgbe*ko
\/bin/rm -f /lib/modules/*/extra/ixgbe*ko
\/bin/rm -rf /var/lib/dkms/ixgbe-zc

veryclean: remove
\/bin/rm -fr /usr/src/@IXGBE@-zc-@IXGBE_VERSION@.@REVISION@
Expand Down
3 changes: 3 additions & 0 deletions drivers/ZC/intel/zc-dkms.mkrpm.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ exit 1
echo -e
echo -e "Uninstall of %{module_name} module (version %{version}) beginning:"
dkms remove -m %{module_name} -v %{version} --all --rpm_safe_upgrade
\/bin/rm -f /lib/modules/$kernel/weak-updates/%{module_name}*
\/bin/rm -f /lib/modules/$kernel/extra/%{module_name}*
\/bin/rm -fr /var/lib/dkms/%{module_name}
exit 0

%files
Expand Down
4 changes: 3 additions & 1 deletion drivers/ZC/intel/zc.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ exit 1
echo -e
echo -e "Uninstall of %{module_name} module (version %{version}) beginning:"
dkms remove -m %{module_name} -v %{version} --all --rpm_safe_upgrade
rm -fr /var/lib/dkms/%{module_name}
\/bin/rm -f /lib/modules/$kernel/weak-updates/%{module_name}*
\/bin/rm -f /lib/modules/$kernel/extra/%{module_name}*
\/bin/rm -fr /var/lib/dkms/%{module_name}
exit 0

%files
Expand Down
3 changes: 3 additions & 0 deletions kernel/pfring-dkms-mkrpm.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ exit 1
echo -e
echo -e "Uninstall of %{module_name} module (version %{version}) beginning:"
dkms remove -m %{module_name} -v %{version} --all --rpm_safe_upgrade
\/bin/rm -f /lib/modules/$kernel/weak-updates/%{module_name}*
\/bin/rm -f /lib/modules/$kernel/extra/%{module_name}*
\/bin/rm -fr /var/lib/dkms/%{module_name}
exit 0

%files
Expand Down

0 comments on commit 1cc0f89

Please sign in to comment.